Browse Source

Make use of the new espeak_ng_InitializePath API.

master
Reece H. Dunn 9 years ago
parent
commit
660f18f3a3
4 changed files with 6 additions and 11 deletions
  1. 3
    3
      src/espeak-ng.c
  2. 0
    2
      src/include/espeak-ng/espeak_ng.h
  3. 0
    3
      src/libespeak-ng/speak_lib.c
  4. 3
    3
      src/speak-ng.c

+ 3
- 3
src/espeak-ng.c View File

phonemes_separator = 0x200d; // ZWJ phonemes_separator = 0x200d; // ZWJ
break; break;
case 0x10e: // --compile-mbrola 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; return (espeak_ng_CompileMbrolaVoice(optarg2, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
case 0x10f: // --compile-intonations 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; return (espeak_ng_CompileIntonation(stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
case 0x110: // --compile-phonemes 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; return (espeak_ng_CompilePhonemeData(22050, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
default: default:
exit(0); exit(0);

+ 0
- 2
src/include/espeak-ng/espeak_ng.h View File

ENE_VERSION_MISMATCH = -5, ENE_VERSION_MISMATCH = -5,
} espeak_ng_STATUS; } espeak_ng_STATUS;


#define espeakINITIALIZE_PATH_ONLY 0x4000

ESPEAK_NG_API void ESPEAK_NG_API void
espeak_ng_InitializePath(const char *path); espeak_ng_InitializePath(const char *path);



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

} }


espeak_ng_InitializePath(path); espeak_ng_InitializePath(path);
if (options & espeakINITIALIZE_PATH_ONLY)
return 0;

initialise(options); initialise(options);
select_output(output_type); select_output(output_type);



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

phonemes_separator = 0x200d; // ZWJ phonemes_separator = 0x200d; // ZWJ
break; break;
case 0x10e: // --compile-mbrola 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; return (espeak_ng_CompileMbrolaVoice(optarg2, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
case 0x10f: // --compile-intonations 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; return (espeak_ng_CompileIntonation(stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
case 0x110: // --compile-phonemes 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; return (espeak_ng_CompilePhonemeData(22050, stdout) == ENS_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
default: default:
exit(0); exit(0);

Loading…
Cancel
Save