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

Merge branch 'development'

Browse Source 
Conflicts:
	src/Makefile
This commit is contained in:
Reece H. Dunn
2014-08-31 17:22:49 +01:00
parent c231e8ef1a 1af0afa88c
commit 81955300d6
31 changed files with 1134 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/transldlg.cpp
+5 -7
View File
@@ -410,7 +410,6 @@ void TranslDlg::OnCommand(wxCommandEvent& event)
const char *phon_out2;
int clause_tone;
int clause_count;
int use_ipa = 0;
FILE *f;
int fd_temp;
char fname_temp[100];
@@ -448,21 +447,20 @@ void TranslDlg::OnCommand(wxCommandEvent& event)
}
#endif
t_phonetic->SetDefaultStyle(style_phonetic);
translate_text = 2;
translate_text = espeakPHONEMES_TRACE;
break;
case T_TRANSLATE:
case MENU_SPEAK_TRANSLATE:
t_phonetic->SetDefaultStyle(style_phonetic);
translate_text = 1;
translate_text = espeakPHONEMES_SHOW;
break;
case T_TRANSLATE_IPA:
case MENU_SPEAK_IPA:
t_phonetic->SetDefaultStyle(style_phonetic_large);
translate_text = 3;
use_ipa = 0x10;
translate_text = espeakPHONEMES_IPA;
break;
case T_PROCESS:
@@ -497,7 +495,7 @@ void TranslDlg::OnCommand(wxCommandEvent& event)
CalcPitches(translator,clause_tone);
CalcLengths(translator);
phon_out2 = GetTranslatedPhonemeString(use_ipa);
phon_out2 = GetTranslatedPhonemeString(option_phonemes);
if(clause_count++ > 0)
strcat(phon_out," ||");
strcat(phon_out, phon_out2);
@@ -515,7 +513,7 @@ void TranslDlg::OnCommand(wxCommandEvent& event)
ph_list[N_PH_LIST].ph = NULL; // to recognize overrun off list (in Generate() )
t_phonetic->Clear();
if(option_phonemes == 2)
if(option_phonemes & espeakPHONEMES_TRACE)
{
option_phonemes=0;
rewind(f_trans);