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

Merge branch 'development'

Browse Source
This commit is contained in:
Reece H. Dunn
2014-07-20 16:34:13 +01:00
parent 256ad226f2 3f1f034f1b
commit 8a237b3315
13 changed files with 329 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dictionary.cpp
+1 -1
View File
@@ -528,7 +528,7 @@ unsigned short ipa1[96] = {
#define N_PHON_OUT 500 // realloc increment
static char *phon_out_buf = NULL; // passes the result of GetTranslatedPhonemeString()
static int phon_out_size = 0;
static unsigned int phon_out_size = 0;
char *WritePhMnemonic(char *phon_out, PHONEME_TAB *ph, PHONEME_LIST *plist, int use_ipa, int *flags)
src/synthdata.cpp
+2 -2
View File
@@ -35,7 +35,7 @@
#include "translate.h"
#include "wave.h"
const char *version_string = "1.48.08 15.Jul.14";
const char *version_string = "1.48.09 20.Jul.14";
const int version_phdata = 0x014801;
int option_device_number = -1;
@@ -809,7 +809,7 @@ static bool InterpretCondition(Translator *tr, int control, PHONEME_LIST *plist,
for(;;)
{
plist++;
plist->ph = phoneme_tab[plist->phcode];
// plist->ph = phoneme_tab[plist->phcode]; // Why was this line here?? It corrupts plist if we have language switching if phoneme_tab is wrong language
if(plist->sourceix != 0)
return(true); // start of next word, without finding another vowel
if(plist->ph->type == phVOWEL)