mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-02 06:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make use of the new espeak_ng_InitializePath API.

Browse Source
This commit is contained in:
Reece H. Dunn
2016-01-01 14:05:33 +00:00
parent 44dbfc1b31
commit 660f18f3a3
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/espeak-ng.c
+3 -3
View File
@@ -566,13 +566,13 @@ int main(int argc, char **argv)
phonemes_separator = 0x200d; // ZWJ
break;
case 0x10e: // --compile-mbrola
samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, 0);
espeak_ng_InitializePath(data_path);
return (espeak_ng_CompileMbrolaVoice(optarg2, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
case 0x10f: // --compile-intonations
samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, espeakINITIALIZE_PATH_ONLY);
espeak_ng_InitializePath(data_path);
return (espeak_ng_CompileIntonation(stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
case 0x110: // --compile-phonemes
samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, espeakINITIALIZE_PATH_ONLY);
espeak_ng_InitializePath(data_path);
return (espeak_ng_CompilePhonemeData(22050, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
default:
exit(0);
src/include/espeak-ng/espeak_ng.h
-2
View File
@@ -44,8 +44,6 @@ typedef enum {
ENE_VERSION_MISMATCH = -5,
} espeak_ng_STATUS;
#define espeakINITIALIZE_PATH_ONLY 0x4000
ESPEAK_NG_API void
espeak_ng_InitializePath(const char *path);
src/libespeak-ng/speak_lib.c
-3
View File
@@ -613,9 +613,6 @@ ESPEAK_API int espeak_Initialize(espeak_AUDIO_OUTPUT output_type, int buf_length
}
espeak_ng_InitializePath(path);
if (options & espeakINITIALIZE_PATH_ONLY)
return 0;
initialise(options);
select_output(output_type);
src/speak-ng.c
+3 -3
View File
@@ -593,13 +593,13 @@ int main(int argc, char **argv)
phonemes_separator = 0x200d; // ZWJ
break;
case 0x10e: // --compile-mbrola
samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, 0);
espeak_ng_InitializePath(data_path);
return (espeak_ng_CompileMbrolaVoice(optarg2, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
case 0x10f: // --compile-intonations
samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, espeakINITIALIZE_PATH_ONLY);
espeak_ng_InitializePath(data_path);
return (espeak_ng_CompileIntonation(stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
case 0x110: // --compile-phonemes
samplerate = espeak_Initialize(AUDIO_OUTPUT_PLAYBACK, 0, data_path, espeakINITIALIZE_PATH_ONLY);
espeak_ng_InitializePath(data_path);
return (espeak_ng_CompilePhonemeData(22050, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
default:
exit(0);