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

Merge branch 'master' into build

Browse Source 
Conflicts:
	src/compiledata.cpp
This commit is contained in:
Reece Dunn
2010-12-19 17:04:24 +00:00
parent e75d60f622 b89d8bde63
commit fa1e735d12
63 changed files with 7484 additions and 2676 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/windows/windows_sapi/src/speech.h
+1
View File
@@ -37,6 +37,7 @@
//#define USE_PORTAUDIO
//#define USE_NANOSLEEP
#define INCLUDE_KLATT
#define INCLUDE_MBROLA
// will look for espeak_data directory here, and also in user's home directory
#define PATH_ESPEAK_DATA "/usr/share/espeak-data"
platforms/windows/windows_sapi/ttseng.dsp
+8
View File
@@ -144,6 +144,10 @@ SOURCE=.\src\setlengths.cpp
# End Source File
# Begin Source File
SOURCE=.\src\sonic.cpp
# End Source File
# Begin Source File
SOURCE=.\src\speak_lib.cpp
# End Source File
# Begin Source File
@@ -237,6 +241,10 @@ SOURCE=.\src\sintab.h
# End Source File
# Begin Source File
SOURCE=.\src\sonic.h
# End Source File
# Begin Source File
SOURCE=.\src\speak_lib.h
# End Source File
# Begin Source File
platforms/windows/windows_sapi/ttsengobj.cpp
+2 -2
View File
@@ -261,8 +261,8 @@ static int ConvertRate(int new_rate)
int rate;
static int rate_table[21] = {80,110,124,133,142,151,159,168,174,180,187,
196,208,220,240,270,300,335,369,390,450 };
static int rate_table[21] = {80,110,124,135,145,155,165,173,180,187,196,
208,220,245,270,300,335,370,410,450,500 };
rate = new_rate + master_rate;
if(rate < -10) rate = -10;