mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-18 18:50:25 +00:00
[1.26.09] UriCallback() "base" parameter has empty string rather than NULL pointer.
lang=pt character names for accentented letters. git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@52 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
+2
-4
@@ -1165,7 +1165,7 @@ int x;
|
||||
}
|
||||
#endif
|
||||
|
||||
char* text1 = "Hello World. This is the second sentence";
|
||||
char* text1 = "Hello World2. <audio src=\"here\"> Some text</audio> This is the second sentence";
|
||||
|
||||
void TestTest(int control)
|
||||
{//=======================
|
||||
@@ -1174,7 +1174,7 @@ void TestTest(int control)
|
||||
unsigned int ix=0;
|
||||
char textbuf[2000];
|
||||
espeak_VOICE voice;
|
||||
espeak_VOICE *voice2;
|
||||
unsigned int unique_identifier=0;
|
||||
|
||||
//FindPhonemesUsed();
|
||||
//return;
|
||||
@@ -1211,8 +1211,6 @@ if(control==2)
|
||||
espeak_SetSynthCallback(TestSynthCallback);
|
||||
espeak_SetUriCallback(TestUriCallback);
|
||||
|
||||
unsigned int unique_identifier=0;
|
||||
int index=0;
|
||||
espeak_Synth(text1, strlen(text1)+1, 0, POS_CHARACTER, 0, espeakSSML|espeakCHARS_UTF8, &unique_identifier, NULL);
|
||||
|
||||
espeak_SetParameter(espeakPUNCTUATION, 1, 0);
|
||||
|
||||
+2
-1
@@ -38,7 +38,7 @@
|
||||
|
||||
espeak_VOICE *SelectVoice(espeak_VOICE *voice_select, int *variant);
|
||||
|
||||
char *xmlbase = NULL; // base URL from <speak>
|
||||
char *xmlbase = ""; // base URL from <speak>
|
||||
|
||||
int namedata_ix=0;
|
||||
int n_namedata = 0;
|
||||
@@ -1316,6 +1316,7 @@ static int ProcessSsmlTag(wchar_t *xml_buf, char *outbuf, int &outix, int n_outb
|
||||
case SSML_AUDIO + SSML_CLOSE:
|
||||
if(uri_callback == NULL)
|
||||
break;
|
||||
PopParamStack(tag_type, outbuf, outix);
|
||||
return(CLAUSE_NONE);
|
||||
|
||||
case SSML_BREAK:
|
||||
|
||||
+1
-1
@@ -35,7 +35,7 @@
|
||||
#include "translate.h"
|
||||
#include "wave.h"
|
||||
|
||||
const char *version_string = "1.26.08 19.Jun.07";
|
||||
const char *version_string = "1.26.09 20.Jun.07";
|
||||
const int version_phdata = 0x012601;
|
||||
|
||||
int option_device_number = -1;
|
||||
|
||||
+1
-2
@@ -52,8 +52,7 @@ int tone_points[10] = {600,170, 1200,135, 2000,110, 3000,110, -1,0};
|
||||
|
||||
// limit the rate of change for each formant number
|
||||
//static int formant_rate_22050[9] = {50, 104, 165, 230, 220, 220, 220, 220, 220}; // values for 22kHz sample rate
|
||||
static int formant_rate_22050[9] = {250, 200, 200, 200, 200, 200, 200, 200, 200}; // values for 22kHz sample rate
|
||||
//static int formant_rate_22050[9] = {50, 100, 165, 200, 200, 200, 200, 200, 200}; // values for 22kHz sample rate
|
||||
static int formant_rate_22050[9] = {240, 180, 180, 180, 180, 180, 180, 180, 180}; // values for 22kHz sample rate
|
||||
int formant_rate[9]; // values adjusted for actual sample rate
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user