From 59ca718d40955fe597bee74a56df3f049cdd6982 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Thu, 19 Jan 2017 19:57:06 +0000 Subject: [PATCH] Always use 'en' as the default voice/language. --- emscripten/js/demo.js | 2 +- espeak-ng-data/voices/default | 4 ---- src/espeak-ng.c | 2 +- src/libespeak-ng/voices.c | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 espeak-ng-data/voices/default diff --git a/emscripten/js/demo.js b/emscripten/js/demo.js index f7482179..b19b21e2 100644 --- a/emscripten/js/demo.js +++ b/emscripten/js/demo.js @@ -240,7 +240,7 @@ function initializeDemo() { opt.value = voice.identifier; console.log('Adding voice: ' + opt.text); sel.add(opt); - if (voice.name === 'default') { + if (voice.name === 'en') { opt.id = 'default-voice'; opt.selected = true; } diff --git a/espeak-ng-data/voices/default b/espeak-ng-data/voices/default deleted file mode 100644 index b2fd9d08..00000000 --- a/espeak-ng-data/voices/default +++ /dev/null @@ -1,4 +0,0 @@ -name default -language en -gender male - diff --git a/src/espeak-ng.c b/src/espeak-ng.c index fbd73c5a..d1304495 100644 --- a/src/espeak-ng.c +++ b/src/espeak-ng.c @@ -592,7 +592,7 @@ int main(int argc, char **argv) } if (voicename[0] == 0) - strcpy(voicename, "default"); + strcpy(voicename, "en"); result = espeak_ng_SetVoiceByName(voicename); if (result != ENS_OK) { diff --git a/src/libespeak-ng/voices.c b/src/libespeak-ng/voices.c index 848abec7..ce48b68d 100644 --- a/src/libespeak-ng/voices.c +++ b/src/libespeak-ng/voices.c @@ -556,7 +556,7 @@ voice_t *LoadVoice(const char *vname, int control) return NULL; } else { if (voicename[0] == 0) - strcpy(voicename, "default"); + strcpy(voicename, "en"); sprintf(path_voices, "%s%cvoices%c", path_home, PATHSEP, PATHSEP); sprintf(buf, "%s%s", path_voices, voicename); // look in the main voices directory