From bc288a04f4d67ea0a65dc8463f83725ca670f25f Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Tue, 29 Dec 2015 17:24:59 +0000 Subject: [PATCH] Implement espeak_SetVoiceByProperties directly from the SetVoiceByProperties implementation. --- src/libespeak-ng/espeak_command.c | 2 +- src/libespeak-ng/espeak_command.h | 1 - src/libespeak-ng/speak_lib.c | 5 ----- src/libespeak-ng/synthesize.h | 1 - src/libespeak-ng/voices.c | 6 +++--- src/speak-ng.c | 2 +- 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/libespeak-ng/espeak_command.c b/src/libespeak-ng/espeak_command.c index 1e6feb36..02939dc2 100644 --- a/src/libespeak-ng/espeak_command.c +++ b/src/libespeak-ng/espeak_command.c @@ -431,7 +431,7 @@ void process_espeak_command(t_espeak_command *the_command) case ET_VOICE_SPEC: { espeak_VOICE *data = &(the_command->u.my_voice_spec); - SetVoiceByProperties(data); + espeak_SetVoiceByProperties(data); } break; default: diff --git a/src/libespeak-ng/espeak_command.h b/src/libespeak-ng/espeak_command.h index 90c79306..8a54e4c6 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 SetVoiceByProperties(espeak_VOICE *voice_selector); void SetParameter(int parameter, int value, int relative); int sync_espeak_terminated_msg(unsigned int unique_identifier, void *user_data); diff --git a/src/libespeak-ng/speak_lib.c b/src/libespeak-ng/speak_lib.c index be2004c5..2d296daa 100644 --- a/src/libespeak-ng/speak_lib.c +++ b/src/libespeak-ng/speak_lib.c @@ -800,11 +800,6 @@ ESPEAK_API espeak_ERROR espeak_Char(wchar_t character) #endif } -ESPEAK_API espeak_ERROR espeak_SetVoiceByProperties(espeak_VOICE *voice_selector) -{ - return SetVoiceByProperties(voice_selector); -} - ESPEAK_API int espeak_GetParameter(espeak_PARAMETER parameter, int current) { // current: 0=default value, 1=current value diff --git a/src/libespeak-ng/synthesize.h b/src/libespeak-ng/synthesize.h index c823d3f9..3213b61c 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 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); int MbrolaTranslate(PHONEME_LIST *plist, int n_phonemes, int resume, FILE *f_mbrola); diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c index 46fba15b..7a04ba25 100644 --- a/src/libespeak-ng/voices.c +++ b/src/libespeak-ng/voices.c @@ -1556,9 +1556,7 @@ espeak_ERROR espeak_SetVoiceByName(const char *name) return EE_INTERNAL_ERROR; // voice name not found } -#pragma GCC visibility pop - -espeak_ERROR SetVoiceByProperties(espeak_VOICE *voice_selector) +espeak_ERROR espeak_SetVoiceByProperties(espeak_VOICE *voice_selector) { const char *voice_id; int voice_found; @@ -1575,6 +1573,8 @@ espeak_ERROR SetVoiceByProperties(espeak_VOICE *voice_selector) return EE_OK; } +#pragma GCC visibility pop + void FreeVoiceList() { int ix; diff --git a/src/speak-ng.c b/src/speak-ng.c index ae4bb6ef..559ff282 100644 --- a/src/speak-ng.c +++ b/src/speak-ng.c @@ -669,7 +669,7 @@ int main(int argc, char **argv) if (espeak_SetVoiceByName(voicename) != EE_OK) { memset(&voice_select, 0, sizeof(voice_select)); voice_select.languages = voicename; - if (SetVoiceByProperties(&voice_select) != EE_OK) { + if (espeak_SetVoiceByProperties(&voice_select) != EE_OK) { fprintf(stderr, "%svoice '%s'\n", err_load, voicename); exit(2); }