mirror of
https://github.com/rhasspy/espeak-ng.git
synced 2026-11-22 11:46:24 +00:00
Always build espeakedit specific data in libespeak-ng.
This commit is contained in:
@@ -1258,7 +1258,6 @@ void InterpretPhoneme(Translator *tr, int control, PHONEME_LIST *plist, PHONEME_
|
|||||||
memcpy(&worddata->prev_vowel, &plist[0], sizeof(PHONEME_LIST));
|
memcpy(&worddata->prev_vowel, &plist[0], sizeof(PHONEME_LIST));
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef _ESPEAKEDIT
|
|
||||||
plist->std_length = phdata->pd_param[i_SET_LENGTH];
|
plist->std_length = phdata->pd_param[i_SET_LENGTH];
|
||||||
if(phdata->sound_addr[0] != 0)
|
if(phdata->sound_addr[0] != 0)
|
||||||
{
|
{
|
||||||
@@ -1270,7 +1269,6 @@ void InterpretPhoneme(Translator *tr, int control, PHONEME_LIST *plist, PHONEME_
|
|||||||
plist->phontab_addr = phdata->sound_addr[1]; // WAV address
|
plist->phontab_addr = phdata->sound_addr[1]; // WAV address
|
||||||
plist->sound_param = phdata->sound_param[1];
|
plist->sound_param = phdata->sound_param[1];
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
} // end of InterpretPhoneme
|
} // end of InterpretPhoneme
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1459,9 +1459,7 @@ int Generate(PHONEME_LIST *phoneme_list, int *n_ph, int resume)
|
|||||||
{
|
{
|
||||||
case phPAUSE:
|
case phPAUSE:
|
||||||
DoPause(p->length,0);
|
DoPause(p->length,0);
|
||||||
#ifdef _ESPEAKEDIT
|
|
||||||
p->std_length = p->ph->std_length;
|
p->std_length = p->ph->std_length;
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case phSTOP:
|
case phSTOP:
|
||||||
|
|||||||
@@ -227,11 +227,9 @@ typedef struct {
|
|||||||
unsigned char newword; // bit 0=start of word, bit 1=end of clause, bit 2=start of sentence
|
unsigned char newword; // bit 0=start of word, bit 1=end of clause, bit 2=start of sentence
|
||||||
unsigned char pitch1;
|
unsigned char pitch1;
|
||||||
unsigned char pitch2;
|
unsigned char pitch2;
|
||||||
#ifdef _ESPEAKEDIT
|
|
||||||
unsigned char std_length;
|
unsigned char std_length;
|
||||||
unsigned int phontab_addr;
|
unsigned int phontab_addr;
|
||||||
int sound_param;
|
int sound_param;
|
||||||
#endif
|
|
||||||
} PHONEME_LIST;
|
} PHONEME_LIST;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user