[1.30.02] Fix bug in LoadVoice() for "intonation" attribute in voice files (in 1.30.01 only).

 

git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@116 d46cf337-b52f-0410-862d-fd96e6ae7743

platforms/windows/windows_dll/src/speak_lib.h

@@ -28,11 +28,14 @@
 
 #include <stdio.h>
 
-#define ESPEAK_API_REVISION  2
+#define ESPEAK_API_REVISION  3
 /*
 Revision 2
    Added parameter "options" to eSpeakInitialize()
 
+Revision 3
+   Added espeakWORDGAP to  espeak_PARAMETER
+
 */
          /********************/
          /*  Initialization  */
@@ -343,12 +346,18 @@ ESPEAK_API espeak_ERROR espeak_Char(wchar_t character);
 
 typedef enum {
   espeakSILENCE=0, /* internal use */
-  espeakRATE,
-  espeakVOLUME,
-  espeakPITCH,
-  espeakRANGE,
-  espeakPUNCTUATION,
-  espeakCAPITALS,
+  espeakRATE=1,
+  espeakVOLUME=2,
+  espeakPITCH=3,
+  espeakRANGE=4,
+  espeakPUNCTUATION=5,
+  espeakCAPITALS=6,
+  espeakWORDGAP=7,
+  espeakOPTIONS=8,   // reserved for misc. options.  not yet used
+  espeakINTONATION=9,
+
+  espeakRESERVED1=10,
+  espeakRESERVED2=11,
   espeakEMPHASIS,   /* internal use */
   espeakLINELENGTH, /* internal use */
   espeakVOICETYPE,  // internal, 1=mbrola
@@ -389,6 +398,8 @@ ESPEAK_API espeak_ERROR espeak_SetParameter(espeak_PARAMETER parameter, int valu
          3 or higher, by raising pitch.  This values gives the amount in Hz by which the pitch
             of a word raised to indicate it has a capital letter.
 
+      espeakWORDGAP:  pause between words, units of 10mS (at the default speed)
+
    Return: EE_OK: operation achieved 
            EE_BUFFER_FULL: the command can not be buffered; 
              you may try after a while to call the function again.

src/synthdata.cpp

@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.30.01  02.Jan.08";
+const char *version_string = "1.30.02  02.Jan.08";
 const int version_phdata  = 0x013000;
 
 int option_device_number = -1;

src/voices.cpp

@@ -725,7 +725,7 @@ voice_t *LoadVoice(const char *vname, int control)
 		case V_INTONATION:   // intonation
 			sscanf(p,"%d %d",&option_tone_flags,&option_tone2);
 			if((option_tone_flags & 0xff) != 0)
-				translator->langopts.intonation_group = option_tone_flags & 0xff;
+				langopts->intonation_group = option_tone_flags & 0xff;
 			break;
 
 		case V_DICTRULES:   // conditional dictionary rules and list entries