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

[1.29.24] Fixed problem where espeak_GetCurrentVoice() gave a newline character after the voice name.

Browse Source 
git-svn-id: https://espeak.svn.sourceforge.net/svnroot/espeak/trunk@110 d46cf337-b52f-0410-862d-fd96e6ae7743
This commit is contained in:
jonsd
2007-12-12 10:46:48 +00:00
parent 38a60f15c6
commit 363753f388
19 changed files with 382 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/voices.cpp
+21 -7
View File
@@ -161,6 +161,25 @@ const char *variant_lists[3] = {variants_either, variants_male, variants_female}
voice_t voicedata;
voice_t *voice = &voicedata;
char *fgets_strip(char *buf, int size, FILE *f_in)
{//===============================================
// strip trailing spaces, and truncate lines at // comment
int len;
char *p;
if(fgets(buf,size,f_in) == NULL)
return(NULL);
len = strlen(buf);
while((--len > 0) && isspace(buf[len]))
buf[len] = 0;
if((p = strstr(buf,"//")) != NULL)
*p = 0;
return(buf);
}
void SetToneAdjust(voice_t *voice, int *tone_pts)
{//==============================================
@@ -257,10 +276,8 @@ static espeak_VOICE *ReadVoiceFile(FILE *f_in, const char *fname, const char*lea
vgender[0] = 0;
age = 0;
while(fgets(linebuf,sizeof(linebuf),f_in) != NULL)
while(fgets_strip(linebuf,sizeof(linebuf),f_in) != NULL)
{
linebuf[strlen(linebuf)-1] = 0;
if(memcmp(linebuf,"name",4)==0)
{
p = &linebuf[4];
@@ -571,11 +588,8 @@ voice_t *LoadVoice(const char *vname, int control)
SelectPhonemeTableName(phonemes_name); // set up phoneme_tab
while((f_voice != NULL) && (fgets(buf,sizeof(buf),f_voice) != NULL))
while((f_voice != NULL) && (fgets_strip(buf,sizeof(buf),f_voice) != NULL))
{
if((p = strstr(buf,"//")) != NULL)
*p = 0;
// isolate the attribute name
for(p=buf; (*p != 0) && !isspace(*p); p++);
*p++ = 0;