From 9ab5fad5965a202e97bd6b4b0611d806d556abda Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Tue, 29 Dec 2015 17:15:43 +0000
Subject: [PATCH] Implement espeak_SetVoiceByName directly from the
 SetVoiceByName implementation.

---
 src/libespeak-ng/espeak_command.c | 2 +-
 src/libespeak-ng/espeak_command.h | 1 -
 src/libespeak-ng/speak_lib.c      | 7 +------
 src/libespeak-ng/synthesize.h     | 1 -
 src/libespeak-ng/voices.c         | 6 +++++-
 src/speak-ng.c                    | 2 +-
 6 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/libespeak-ng/espeak_command.c b/src/libespeak-ng/espeak_command.c
index 4b24a360..1e6feb36 100644
--- a/src/libespeak-ng/espeak_command.c
+++ b/src/libespeak-ng/espeak_command.c
@@ -425,7 +425,7 @@ void process_espeak_command(t_espeak_command *the_command)
 	case ET_VOICE_NAME:
 	{
 		const char *data = the_command->u.my_voice_name;
-		SetVoiceByName(data);
+		espeak_SetVoiceByName(data);
 	}
 		break;
 	case ET_VOICE_SPEC:
diff --git a/src/libespeak-ng/espeak_command.h b/src/libespeak-ng/espeak_command.h
index ce945655..90c79306 100644
--- a/src/libespeak-ng/espeak_command.h
+++ b/src/libespeak-ng/espeak_command.h
@@ -145,7 +145,6 @@ void sync_espeak_SetPunctuationList(const wchar_t *punctlist);
 void sync_espeak_SetParameter(espeak_PARAMETER parameter, int value, int relative);
 int sync_espeak_SetVoiceByName(const char *name);
 int sync_espeak_SetVoiceByProperties(espeak_VOICE *voice_selector);
-espeak_ERROR SetVoiceByName(const char *name);
 espeak_ERROR SetVoiceByProperties(espeak_VOICE *voice_selector);
 void SetParameter(int parameter, int value, int relative);
 
diff --git a/src/libespeak-ng/speak_lib.c b/src/libespeak-ng/speak_lib.c
index 1b5f4c18..be2004c5 100644
--- a/src/libespeak-ng/speak_lib.c
+++ b/src/libespeak-ng/speak_lib.c
@@ -364,7 +364,7 @@ static espeak_ERROR Synthesize(unsigned int unique_identifier, const void *text,
 #endif
 
 	if (translator == NULL)
-		SetVoiceByName("default");
+		espeak_SetVoiceByName("default");
 
 	SpeakNextClause(NULL, text, 0);
 
@@ -800,11 +800,6 @@ ESPEAK_API espeak_ERROR espeak_Char(wchar_t character)
 #endif
 }
 
-ESPEAK_API espeak_ERROR espeak_SetVoiceByName(const char *name)
-{
-	return SetVoiceByName(name);
-}
-
 ESPEAK_API espeak_ERROR espeak_SetVoiceByProperties(espeak_VOICE *voice_selector)
 {
 	return SetVoiceByProperties(voice_selector);
diff --git a/src/libespeak-ng/synthesize.h b/src/libespeak-ng/synthesize.h
index 84c80d9a..c823d3f9 100644
--- a/src/libespeak-ng/synthesize.h
+++ b/src/libespeak-ng/synthesize.h
@@ -542,7 +542,6 @@ extern double sonicSpeed;
 extern int n_soundicon_tab;
 extern SOUND_ICON soundicon_tab[N_SOUNDICON_TAB];
 
-espeak_ERROR SetVoiceByName(const char *name);
 espeak_ERROR SetVoiceByProperties(espeak_VOICE *voice_selector);
 espeak_ERROR LoadMbrolaTable(const char *mbrola_voice, const char *phtrans, int *srate);
 void SetParameter(int parameter, int value, int relative);
diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c
index 8a828c53..46fba15b 100644
--- a/src/libespeak-ng/voices.c
+++ b/src/libespeak-ng/voices.c
@@ -1504,7 +1504,9 @@ static void GetVoices(const char *path)
 #endif
 }
 
-espeak_ERROR SetVoiceByName(const char *name)
+#pragma GCC visibility push(default)
+
+espeak_ERROR espeak_SetVoiceByName(const char *name)
 {
 	espeak_VOICE *v;
 	int ix;
@@ -1554,6 +1556,8 @@ espeak_ERROR SetVoiceByName(const char *name)
 	return EE_INTERNAL_ERROR; // voice name not found
 }
 
+#pragma GCC visibility pop
+
 espeak_ERROR SetVoiceByProperties(espeak_VOICE *voice_selector)
 {
 	const char *voice_id;
diff --git a/src/speak-ng.c b/src/speak-ng.c
index df126cf3..ae4bb6ef 100644
--- a/src/speak-ng.c
+++ b/src/speak-ng.c
@@ -666,7 +666,7 @@ int main(int argc, char **argv)
 	if (voicename[0] == 0)
 		strcpy(voicename, "default");
 
-	if (SetVoiceByName(voicename) != EE_OK) {
+	if (espeak_SetVoiceByName(voicename) != EE_OK) {
 		memset(&voice_select, 0, sizeof(voice_select));
 		voice_select.languages = voicename;
 		if (SetVoiceByProperties(&voice_select) != EE_OK) {