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

Propagate the Synthesize status return code through sync_espeak_(Key|Char).

Browse Source
This commit is contained in:
Reece H. Dunn
2016-01-02 16:20:37 +00:00
parent bf6f6f093f
commit 21d29154ce
3 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libespeak-ng/espeak_command.c
+2
View File
@@ -18,6 +18,8 @@
#include "config.h"
#include "espeak_ng.h"
#include "speech.h"
#include "espeak_command.h"
#include <stdlib.h>
src/libespeak-ng/espeak_command.h
+2 -2
View File
@@ -137,8 +137,8 @@ espeak_ERROR sync_espeak_Synth(unsigned int unique_identifier, const void *text,
espeak_ERROR sync_espeak_Synth_Mark(unsigned int unique_identifier, const void *text,
const char *index_mark, unsigned int end_position,
unsigned int flags, void *user_data);
void sync_espeak_Key(const char *key);
void sync_espeak_Char(wchar_t character);
espeak_ng_STATUS sync_espeak_Key(const char *key);
espeak_ng_STATUS sync_espeak_Char(wchar_t character);
void sync_espeak_SetPunctuationList(const wchar_t *punctlist);
void sync_espeak_SetParameter(espeak_PARAMETER parameter, int value, int relative);
int sync_espeak_SetVoiceByName(const char *name);
src/libespeak-ng/speech.c
+12 -21
View File
@@ -567,25 +567,22 @@ espeak_ERROR sync_espeak_Synth_Mark(unsigned int unique_identifier, const void *
return status_to_espeak_error(Synthesize(unique_identifier, text, flags | espeakSSML));
}
void sync_espeak_Key(const char *key)
espeak_ng_STATUS sync_espeak_Key(const char *key)
{
// symbolic name, symbolicname_character - is there a system resource of symbolic names per language?
int letter;
int ix;
ix = utf8_in(&letter, key);
if (key[ix] == 0) {
// a single character
sync_espeak_Char(letter);
return;
}
if (key[ix] == 0) // a single character
return sync_espeak_Char(letter);
my_unique_identifier = 0;
my_user_data = NULL;
Synthesize(0, key, 0); // speak key as a text string
return Synthesize(0, key, 0); // speak key as a text string
}
void sync_espeak_Char(wchar_t character)
espeak_ng_STATUS sync_espeak_Char(wchar_t character)
{
// is there a system resource of character names per language?
char buf[80];
@@ -593,7 +590,7 @@ void sync_espeak_Char(wchar_t character)
my_user_data = NULL;
sprintf(buf, "<say-as interpret-as=\"tts:char\">&#%d;</say-as>", character);
Synthesize(0, buf, espeakSSML);
return Synthesize(0, buf, espeakSSML);
}
void sync_espeak_SetPunctuationList(const wchar_t *punctlist)
@@ -705,10 +702,8 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SpeakKeyName(const char *key_name)
{
// symbolic name, symbolicname_character - is there a system resource of symbolicnames per language
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS) {
sync_espeak_Key(key_name);
return ENS_OK;
}
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS)
return sync_espeak_Key(key_name);
#ifdef USE_ASYNC
t_espeak_command *c = create_espeak_key(key_name, NULL);
@@ -717,8 +712,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SpeakKeyName(const char *key_name)
delete_espeak_command(c);
return status;
#else
sync_espeak_Key(key_name);
return ENS_OK;
return sync_espeak_Key(key_name);
#endif
}
@@ -727,10 +721,8 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SpeakCharacter(wchar_t character)
// is there a system resource of character names per language?
#ifdef USE_ASYNC
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS) {
sync_espeak_Char(character);
return ENS_OK;
}
if (my_mode & ENOUTPUT_MODE_SYNCHRONOUS)
return sync_espeak_Char(character);
t_espeak_command *c = create_espeak_char(character, NULL);
espeak_ng_STATUS status = fifo_add_command(c);
@@ -738,8 +730,7 @@ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_SpeakCharacter(wchar_t character)
delete_espeak_command(c);
return status;
#else
sync_espeak_Char(character);
return ENS_OK;
return sync_espeak_Char(character);
#endif
}