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

Merge branch 'master' into build

Browse Source 
Conflicts:
	src/synthdata.cpp
	src/voices.cpp
This commit is contained in:
Reece Dunn
2011-09-21 01:25:02 +01:00
parent 924d1a865c 9e73010621
commit 397583db3b
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.espeakedit
+1 -1
View File
@@ -20,7 +20,7 @@ CPPFLAGS = -Wall -g -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6
-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES
-D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
CXXFLAGS = -O2 -g0 -Wall -g -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 \
CXXFLAGS = -O2 -Wall -fexceptions -I/usr/lib/wx/include/gtk2-unicode-release-2.6 -I/usr/include/wx-2.6 \
-DGTK_NO_CHECK_CASTS -D__WXGTK__ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -DNO_GCC_PRAGMA -D_ESPEAKEDIT
all: espeakedit
src/synthdata.cpp
+9 -2
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.45.44 16.Sep.11";
const char *version_string = "1.45.43 16.Sep.11";
const int version_phdata = 0x014500;
int option_device_number = -1;
@@ -644,6 +644,13 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
if(plist[0].sourceix)
return(false);
}
// if(which==7)
// {
// // nextPh2 not word boundary
// if((plist[1].sourceix) || (plist[2].sourceix))
// return(false);
// }
if(which==6)
{
// nextVowel, not word boundary
@@ -679,7 +686,7 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
}
ph = plist->ph;
if(instn2 < 7)
if(instn2 < 8)
{
// 'data' is a phoneme number
if((phoneme_tab[data]->mnemonic == ph->mnemonic) == true)
src/voices.cpp
+1
View File
@@ -1744,6 +1744,7 @@ espeak_ERROR SetVoiceByProperties(espeak_VOICE *voice_selector)
return(EE_OK);
} // end of SetVoiceByProperties
void FreeVoiceList()
{//=================
for(int ix=0; ix<n_voices_list; ix++)