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

[1.27.08] Fix to inheriting voice attributes over <speak> and <voice> tags.

Browse Source 
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@63 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-07-10 16:10:26 +00:00
parent 0c3b856173
commit 3546b19965
9 changed files with 99 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wavegen.cpp
+27 -23
View File
@@ -322,6 +322,28 @@ unsigned char pitch_adjust_tab[MAX_PITCH_VALUE+1] = {
int WavegenFill(int fill_zeros);
#ifdef LOG_FRAMES
static void LogMarker(int type, int value)
{//=======================================
if(option_log_frames == 0)
return;
if((type == espeakEVENT_PHONEME) || (type == espeakEVENT_SENTENCE))
{
f_log=fopen("log-espeakedit","a");
if(f_log)
{
if(type == espeakEVENT_PHONEME)
fprintf(f_log,"Phoneme [%s]\n",WordToString(value));
else
fprintf(f_log,"\n");
fclose(f_log);
f_log = NULL;
}
}
}
#endif
void WcmdqStop()
{//=============
wcmdq_head = 0;
@@ -1495,7 +1517,10 @@ void SetEmbedded(int control, int value)
void WavegenSetVoice(voice_t *v)
{//=============================
wvoice = v;
static voice_t v2;
memcpy(&v2,v,sizeof(v2));
wvoice = &v2;
if(v->peak_shape==0)
pk_shape = pk_shape1;
@@ -1684,28 +1709,6 @@ if(option_log_frames)
} // end of SetSynth
#ifdef LOG_FRAMES
static void LogMarker(int type, int value)
{//=======================================
if(option_log_frames == 0)
return;
if((type == espeakEVENT_PHONEME) || (type == espeakEVENT_SENTENCE))
{
f_log=fopen("log-espeakedit","a");
if(f_log)
{
if(type == espeakEVENT_PHONEME)
fprintf(f_log,"Phoneme [%s]\n",WordToString(value));
else
fprintf(f_log,"\n");
fclose(f_log);
f_log = NULL;
}
}
}
#endif
static int Wavegen2(int length, int modulation, int resume, frame_t *fr1, frame_t *fr2)
{//====================================================================================
if(resume==0)
@@ -1894,6 +1897,7 @@ int WavegenFill(int fill_zeros)
case WCMD_VOICE:
WavegenSetVoice((voice_t *)q[1]);
free((voice_t *)q[1]);
break;
case WCMD_EMBEDDED: