Merge branch 'development'

Conflicts:
	phsource/phonemes
This commit is contained in:
Reece H. Dunn
2014-03-04 17:51:51 +00:00
46 changed files with 2386 additions and 1011 deletions
+7 -1
View File
@@ -1,5 +1,5 @@
/***************************************************************************
* Copyright (C) 2005 to 2013 by Jonathan Duddington *
* Copyright (C) 2005 to 2014 by Jonathan Duddington *
* email: jonsd@users.sourceforge.net *
* Copyright (C) 2013 by Reece H. Dunn *
* *
@@ -139,6 +139,12 @@ if(argc > 1)
if(strcmp(param,"--compile")==0)
{
samplerate_native = samplerate = 22050;
LoadPhData(NULL);
if(LoadVoice("", 0) == NULL)
{
fprintf(stderr, "Failed to load default voice\n");
exit(1);
}
CompilePhonemeData();
CompileIntonation();
}