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

Merge branch 'development'

Browse Source 
Conflicts:
	src/espeakedit.cpp
	src/options.cpp
This commit is contained in:
Reece H. Dunn
2014-01-28 19:04:40 +00:00
parent 6a45e7b162 464e4d7e11
commit 08e6d8dcf6
18 changed files with 443 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/options.cpp
+8
View File
@@ -39,6 +39,7 @@ extern int GetNumeric(wxTextCtrl *t);
extern void SetNumeric(wxTextCtrl *t, int value);
extern int samplerate;
wxString path_espeakdata;
wxString path_spectload;
wxString path_spectload2;
wxString path_pitches;
@@ -178,6 +179,12 @@ void ConfigInit(bool use_defaults)
}
else
{
pConfig->Read(_T("/espeakdata"),&path_espeakdata,wxEmptyString);
if(path_espeakdata != wxEmptyString)
{
strcpy(path_home, path_espeakdata.mb_str(wxConvLocal));
}
pConfig->Read(_T("/spectload"),&path_spectload,basedir+_T("/phsource"));
pConfig->Read(_T("/spectload2"),&path_spectload2,basedir+_T("/phsource"));
pConfig->Read(_T("/pitchpath"),&path_pitches,basedir+_T("/pitch"));
@@ -210,6 +217,7 @@ void ConfigSave(int exit)
#ifndef PLATFORM_WINDOWS
// pConfig->Write(_T("/samplerate"),samplerate);
#endif
pConfig->Write(_T("/espeakdata"),path_espeakdata);
pConfig->Write(_T("/spectload"),path_spectload);
pConfig->Write(_T("/spectload2"),path_spectload2);
pConfig->Write(_T("/pitchpath"),path_pitches);