mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the additional LoadVoice search heuristics.

Browse Source 
These heuristics were designed to guess the location of the voice
files without searching the voice list. The heuristics are very
implementation dependent, and easily break when voices move around.
The voices are still found correctly, so these heuristics are
redundant.
This commit is contained in:
Reece H. Dunn
2016-01-23 14:50:43 +00:00
parent 7048ebdccf
commit e8015df0f8
1 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/voices.c
+1 -29
View File
@@ -544,12 +544,6 @@ voice_t *LoadVoice(const char *vname, int control)
static char voice_name[40]; // voice name for current_voice_selected
static char voice_languages[100]; // list of languages and priorities for current_voice_selected
// which directory to look for a named voice. List of voice names, must end in a space.
static const char *voices_asia =
"az bn fa fa-pin gu hi hy hy-west id ka kn ku ml ms ne pa ta te tr vi vi-hue vi-sgn zh zh-yue ";
static const char *voices_europe =
"an bg bs ca cs cy da de el en en-us es et eu fi fr fr-be ga hr hu is it lt lv mk nl no pl pt-pt ro ru sk sq sr sv ";
strncpy0(voicename, vname, sizeof(voicename));
if (control & 0x10) {
strcpy(buf, vname);
@@ -560,29 +554,7 @@ voice_t *LoadVoice(const char *vname, int control)
strcpy(voicename, "default");
sprintf(path_voices, "%s%cvoices%c", path_home, PATHSEP, PATHSEP);
sprintf(buf, "%s%s", path_voices, voicename); // first, look in the main voices directory
if (GetFileLength(buf) <= 0) {
// then look in the appropriate subdirectory
if ((voicename[0] == 'm') && (voicename[1] == 'b'))
voice_dir = "mb"; // mbrola voices
else {
sprintf(name2, "%s ", voicename);
if (strstr(voices_europe, voicename) != NULL)
voice_dir = "europe";
else if (strstr(voices_asia, voicename) != NULL)
voice_dir = "asia";
else
voice_dir = "other";
}
sprintf(buf, "%s%s%c%s", path_voices, voice_dir, PATHSEP, voicename);
if (GetFileLength(buf) <= 0) {
// if not found, look in "test" sub-directory
sprintf(buf, "%stest%c%s", path_voices, PATHSEP, voicename);
}
}
sprintf(buf, "%s%s", path_voices, voicename); // look in the main voices directory
}
f_voice = fopen(buf, "r");