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

code cleanup: move CheckTranslator() to langopts.c

Browse Source
This commit is contained in:
Juho Hiltunen
2022-10-09 16:38:53 +03:00
parent 159ab0ee76
commit 3182dee147
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/langopts.c
+14 -2
View File
@@ -27,8 +27,6 @@
#include <stdlib.h>
#include <string.h>
static int LookupTune(const char *name);
#include <espeak-ng/espeak_ng.h>
#include <espeak-ng/speak_lib.h>
#include <espeak-ng/encoding.h>
@@ -39,6 +37,9 @@ static int LookupTune(const char *name);
#include "voice.h" // for CheckTranslator()
#include "synthdata.h" // for n_tunes, tunes
static int CheckTranslator(Translator *tr, const MNEM_TAB *keyword_tab, int key);
static int LookupTune(const char *name);
enum {
V_NAME = 1,
V_LANGUAGE,
@@ -265,3 +266,14 @@ static int LookupTune(const char *name) {
return -1;
}
int CheckTranslator(Translator *tr, const MNEM_TAB *keyword_tab, int key)
{
// Return 0 if translator is set.
// Return 1 and print an error message for specified key if not
// used for parsing language options
if (tr)
return 0;
fprintf(stderr, "Cannot set %s: language not set, or is invalid.\n", LookupMnemName(keyword_tab, key));
return 1;
}
src/libespeak-ng/voice.h
-1
View File
@@ -84,7 +84,6 @@ extern espeak_VOICE current_voice_selected;
extern voice_t *voice;
extern int tone_points[12];
int CheckTranslator(Translator *tr, const MNEM_TAB *keyword_tab, int key);
const char *SelectVoice(espeak_VOICE *voice_select, int *found);
espeak_VOICE *SelectVoiceByName(espeak_VOICE **voices, const char *name);
voice_t *LoadVoice(const char *voice_name, int control);
src/libespeak-ng/voices.c
-12
View File
@@ -498,18 +498,6 @@ void ReadNumbers(char *p, int *flags, int maxValue, const MNEM_TAB *keyword_tab
}
}
int CheckTranslator(Translator *tr, const MNEM_TAB *keyword_tab, int key)
{
// Return 0 if translator is set.
// Return 1 and print an error message for specified key if not
// used for parsing language options
if (tr)
return 0;
fprintf(stderr, "Cannot set %s: language not set, or is invalid.\n", LookupMnemName(keyword_tab, key));
return 1;
}
voice_t *LoadVoice(const char *vname, int control)
{
// control, bit 0 1= no_default