[1.28.05] Changed names of voice variant files (espeak-data/voices/!v).

Moves "wisper" and "croak" into voices/!v.
Voice variants can now be specified as  en+wisper, en+f2 (for female 2), etc.
espeak --voices=variant  lists the voice variants.
Moves some lines from speech.h into other header files.
Possible fix for data version check on big-endian.
Fixed crash error iin LoadConfig().
Fixed crash in espeakedit: press Tab in enpty Prosody window.

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@74 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-08-17 12:58:34 +00:00
parent d4ff77a7d5
commit 5019e65842
44 changed files with 186 additions and 414 deletions
+10 -4
View File
@@ -29,13 +29,13 @@
#include "speak_lib.h"
#include "speech.h"
#include "voice.h"
#include "phoneme.h"
#include "synthesize.h"
#include "voice.h"
#include "translate.h"
#include "wave.h"
const char *version_string = "1.28.04 15.Aug.07";
const char *version_string = "1.28.05 17.Aug.07";
const int version_phdata = 0x012801;
int option_device_number = -1;
@@ -125,7 +125,13 @@ int LoadPhData()
return(-1);
wavefile_data = (unsigned char *)spects_data;
version = *((unsigned int *)spects_data);
// read the version number from the first 4 bytes of phondata
version = 0;
for(ix=0; ix<4; ix++)
{
version += (wavefile_data[ix] << (ix*8));
}
if(version != version_phdata)
{
result = version;
@@ -635,7 +641,7 @@ void LoadConfig(void)
if(ix==2)
{
soundicon_tab[n_soundicon_tab].name = c1;
p = Alloc(strlen(string+1));
p = Alloc(strlen(string)+1);
strcpy(p,string);
soundicon_tab[n_soundicon_tab].filename = p;
soundicon_tab[n_soundicon_tab++].length = 0;