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

Merge branch 'development'

Browse Source 
Conflicts:
	docs/speak_lib.h
	src/main.h
	src/speak_lib.cpp
	src/spect.h
This commit is contained in:
Reece H. Dunn
2013-11-29 23:43:03 +00:00
parent 72af75701d 6e9bc0e97e
commit 693c9a9966
43 changed files with 8028 additions and 2084 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/speak_lib.cpp
+8 -3
View File
@@ -733,8 +733,12 @@ void sync_espeak_SetPunctuationList(const wchar_t *punctlist)
my_unique_identifier = 0;
my_user_data = NULL;
wcsncpy(option_punctlist, punctlist ? punctlist : L"", N_PUNCTLIST);
option_punctlist[N_PUNCTLIST-1] = 0;
option_punctlist[0] = 0;
if(punctlist != NULL)
{
wcsncpy(option_punctlist, punctlist, N_PUNCTLIST);
option_punctlist[N_PUNCTLIST-1] = 0;
}
} // end of sync_espeak_SetPunctuationList
@@ -793,8 +797,9 @@ ENTER("espeak_Initialize");
}
// buflength is in mS, allocate 2 bytes per sample
if(buf_length == 0)
if((buf_length == 0) || (output_type == AUDIO_OUTPUT_PLAYBACK) || (output_type == AUDIO_OUTPUT_SYNCH_PLAYBACK))
buf_length = 200;
outbuf_size = (buf_length * samplerate)/500;
outbuf = (unsigned char*)realloc(outbuf,outbuf_size);
if((out_start = outbuf) == NULL)