Browse Source

Implement espeak_SetVoiceByProperties directly from the SetVoiceByProperties implementation.

master
Reece H. Dunn 9 years ago
parent
commit
bc288a04f4

+ 1
- 1
src/libespeak-ng/espeak_command.c View File

@@ -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:

+ 0
- 1
src/libespeak-ng/espeak_command.h View File

@@ -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);

+ 0
- 5
src/libespeak-ng/speak_lib.c View File

@@ -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

+ 0
- 1
src/libespeak-ng/synthesize.h View File

@@ -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);

+ 3
- 3
src/libespeak-ng/voices.c View File

@@ -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;

+ 1
- 1
src/speak-ng.c View File

@@ -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);
}

Loading…
Cancel
Save