mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-11-03 14:17:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into android

Browse Source 
Conflicts:
	src/voices.cpp
This commit is contained in:
Reece H. Dunn
2013-01-25 16:34:39 +00:00
parent 6edd17eb0c 099b6a3bbb
commit b425ded8f0
33 changed files with 12682 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/voices.cpp
+2 -1
View File
@@ -1781,7 +1781,7 @@ ESPEAK_API const espeak_VOICE **espeak_ListVoices(espeak_VOICE *voice_spec)
int ix;
int j;
espeak_VOICE *v;
static espeak_VOICE *voices[N_VOICES_LIST];
static espeak_VOICE **voices = NULL;
char path_voices[sizeof(path_home)+12];
// free previous voice list data
@@ -1793,6 +1793,7 @@ ESPEAK_API const espeak_VOICE **espeak_ListVoices(espeak_VOICE *voice_spec)
GetVoices(path_voices);
voices_list[n_voices_list] = NULL; // voices list terminator
LOGI("GetVoices found %d voices.", n_voices_list);
voices = (espeak_VOICE **)realloc(voices, sizeof(espeak_VOICE *)*(n_voices_list+1));
// sort the voices list
qsort(voices_list,n_voices_list,sizeof(espeak_VOICE *),