[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/4] rename EMessageType to SPDMessageType
|
From: |
Andrei Kholodnyi |
|
Subject: |
[PATCH 1/4] rename EMessageType to SPDMessageType |
|
Date: |
Wed, 27 Oct 2010 17:15:18 +0200 |
follow conventions for speechd.h rename MessageType from E* to SPD*
---
include/speechd_types.h | 15 ++++++-------
src/modules/cicero.c | 6 ++--
src/modules/dummy.c | 2 +-
src/modules/espeak.c | 12 +++++-----
src/modules/festival.c | 46 ++++++++++++++++++++++----------------------
src/modules/flite.c | 6 ++--
src/modules/generic.c | 8 +++---
src/modules/ibmtts.c | 18 ++++++++--------
src/modules/ivona.c | 26 ++++++++++++------------
src/modules/module_utils.c | 18 ++++++++--------
src/modules/module_utils.h | 10 ++++----
src/modules/pico.c | 2 +-
src/server/output.c | 8 +++---
src/server/parse.c | 10 ++++----
src/server/parse.h | 2 +-
src/server/server.c | 2 +-
src/server/server.h | 2 +-
src/server/speaking.c | 6 ++--
src/server/speechd.h | 2 +-
19 files changed, 100 insertions(+), 101 deletions(-)
diff --git a/include/speechd_types.h b/include/speechd_types.h
index 90b0090..66bc9a4 100644
--- a/include/speechd_types.h
+++ b/include/speechd_types.h
@@ -97,13 +97,12 @@ typedef enum
SORT_BY_ALPHABET = 1
}ESort;
-typedef enum
- {
- MSGTYPE_TEXT = 0,
- MSGTYPE_SOUND_ICON = 1,
- MSGTYPE_CHAR = 2,
- MSGTYPE_KEY = 3,
- MSGTYPE_SPELL = 99
- }EMessageType;
+typedef enum {
+ SPD_MSGTYPE_TEXT = 0,
+ SPD_MSGTYPE_SOUND_ICON = 1,
+ SPD_MSGTYPE_CHAR = 2,
+ SPD_MSGTYPE_KEY = 3,
+ SPD_MSGTYPE_SPELL = 99
+} SPDMessageType;
#endif /* not ifndef SPEECHD_TYPES */
diff --git a/src/modules/cicero.c b/src/modules/cicero.c
index cc9823b..eea2e6b 100644
--- a/src/modules/cicero.c
+++ b/src/modules/cicero.c
@@ -47,7 +47,7 @@ static pthread_t cicero_speaking_thread;
static sem_t *cicero_semaphore;
static char **cicero_message;
-static EMessageType cicero_message_type;
+static SPDMessageType cicero_message_type;
static int cicero_position = 0;
static int cicero_pause_requested = 0;
@@ -243,7 +243,7 @@ module_list_voices(void)
int
-module_speak(gchar *data, size_t bytes, EMessageType msgtype)
+module_speak(gchar *data, size_t bytes, SPDMessageType msgtype)
{
DBG("Module speak\n");
@@ -260,7 +260,7 @@ module_speak(gchar *data, size_t bytes, EMessageType
msgtype)
*cicero_message = NULL;
}
*cicero_message = module_strip_ssml(data);
- cicero_message_type = MSGTYPE_TEXT;
+ cicero_message_type = SPD_MSGTYPE_TEXT;
/* Setting voice */
/* UPDATE_PARAMETER(voice, cicero_set_voice); */
diff --git a/src/modules/dummy.c b/src/modules/dummy.c
index 988ad17..1835d77 100644
--- a/src/modules/dummy.c
+++ b/src/modules/dummy.c
@@ -106,7 +106,7 @@ module_list_voices(void)
int
-module_speak(gchar *data, size_t bytes, EMessageType msgtype)
+module_speak(gchar *data, size_t bytes, SPDMessageType msgtype)
{
DBG("speak()\n");
diff --git a/src/modules/espeak.c b/src/modules/espeak.c
index 3c46cc9..5f1ec52 100644
--- a/src/modules/espeak.c
+++ b/src/modules/espeak.c
@@ -332,7 +332,7 @@ module_list_voices(void)
int
-module_speak(gchar *data, size_t bytes, EMessageType msgtype)
+module_speak(gchar *data, size_t bytes, SPDMessageType msgtype)
{
espeak_ERROR result = EE_INTERNAL_ERROR;
int flags = espeakSSML | espeakCHARS_UTF8;
@@ -367,11 +367,11 @@ module_speak(gchar *data, size_t bytes, EMessageType
msgtype)
*/
/* Send data to espeak */
switch (msgtype) {
- case MSGTYPE_TEXT:
+ case SPD_MSGTYPE_TEXT:
result = espeak_Synth(data, bytes + 1, 0, POS_CHARACTER, 0,
flags, NULL, NULL);
break;
- case MSGTYPE_SOUND_ICON:
+ case SPD_MSGTYPE_SOUND_ICON:
{
char *msg = g_strdup_printf("<audio
src=\"%s%s\">%s</audio>",
EspeakSoundIconFolder, data, data);
@@ -380,7 +380,7 @@ module_speak(gchar *data, size_t bytes, EMessageType
msgtype)
g_free(msg);
break;
}
- case MSGTYPE_CHAR:
+ case SPD_MSGTYPE_CHAR:
{
wchar_t wc = 0;
if (bytes == 1) { // ASCII
@@ -404,7 +404,7 @@ module_speak(gchar *data, size_t bytes, EMessageType
msgtype)
g_free(msg);
break;
}
- case MSGTYPE_KEY:
+ case SPD_MSGTYPE_KEY:
{
/* TODO: Convert unspeakable keys to speakable form */
char *msg = g_strdup_printf("<say-as
interpret-as=\"tts:key\">%s</say-as>", data);
@@ -413,7 +413,7 @@ module_speak(gchar *data, size_t bytes, EMessageType
msgtype)
g_free(msg);
break;
}
- case MSGTYPE_SPELL:
+ case SPD_MSGTYPE_SPELL:
/* TODO: Not sure what to do here... */
break;
}
diff --git a/src/modules/festival.c b/src/modules/festival.c
index 8285860..5ba0469 100644
--- a/src/modules/festival.c
+++ b/src/modules/festival.c
@@ -45,7 +45,7 @@ static int festival_speaking = 0;
static int festival_pause_requested = 0;
static char **festival_message;
-static EMessageType festival_message_type;
+static SPDMessageType festival_message_type;
signed int festival_volume = 0;
int festival_stop_request = 0;
@@ -148,7 +148,7 @@ void festival_set_volume(signed int volume);
int init_festival_standalone();
int init_festival_socket();
-int is_text(EMessageType msg_type);
+int is_text(SPDMessageType msg_type);
MOD_OPTION_1_INT(FestivalComunicationType)
@@ -192,8 +192,8 @@ TCache FestivalCache;
int cache_init();
int cache_reset();
-int cache_insert(char* key, EMessageType msgtype, FT_Wave *value);
-FT_Wave* cache_lookup(const char *key, EMessageType msgtype, int add_counter);
+int cache_insert(char* key, SPDMessageType msgtype, FT_Wave *value);
+FT_Wave* cache_lookup(const char *key, SPDMessageType msgtype, int
add_counter);
pthread_mutex_t sound_output_mutex;
@@ -322,7 +322,7 @@ module_list_voices(void)
}
int
-module_speak(char *data, size_t bytes, EMessageType msgtype)
+module_speak(char *data, size_t bytes, SPDMessageType msgtype)
{
int ret;
@@ -338,8 +338,8 @@ module_speak(char *data, size_t bytes, EMessageType msgtype)
festival_stop_request = 0;
festival_message_type = msgtype;
- if ((msgtype == MSGTYPE_TEXT) && (msg_settings.spelling_mode ==
SPD_SPELL_ON))
- festival_message_type = MSGTYPE_SPELL;
+ if ((msgtype == SPD_MSGTYPE_TEXT) && (msg_settings.spelling_mode ==
SPD_SPELL_ON))
+ festival_message_type = SPD_MSGTYPE_SPELL;
/* If the connection crashed or language or voice
@@ -671,11 +671,11 @@ _festival_speak(void* nothing)
switch(festival_message_type)
{
- case MSGTYPE_TEXT: r =
festivalStringToWaveRequest(festival_info, *festival_message); break;
- case MSGTYPE_SOUND_ICON: r = festivalSoundIcon(festival_info,
*festival_message); break;
- case MSGTYPE_CHAR: r = festivalCharacter(festival_info,
*festival_message); break;
- case MSGTYPE_KEY: r = festivalKey(festival_info,
*festival_message); break;
- case MSGTYPE_SPELL: r = festivalSpell(festival_info,
*festival_message); break;
+ case SPD_MSGTYPE_TEXT: r =
festivalStringToWaveRequest(festival_info, *festival_message); break;
+ case SPD_MSGTYPE_SOUND_ICON: r =
festivalSoundIcon(festival_info, *festival_message); break;
+ case SPD_MSGTYPE_CHAR: r = festivalCharacter(festival_info,
*festival_message); break;
+ case SPD_MSGTYPE_KEY: r = festivalKey(festival_info,
*festival_message); break;
+ case SPD_MSGTYPE_SPELL: r = festivalSpell(festival_info,
*festival_message); break;
default: r = -1;
}
if (r < 0){
@@ -728,9 +728,9 @@ _festival_speak(void* nothing)
CLEAN_UP(0, module_report_event_end);
}
- if (festival_message_type == MSGTYPE_CHAR
- || festival_message_type == MSGTYPE_KEY
- || festival_message_type == MSGTYPE_SOUND_ICON){
+ if (festival_message_type == SPD_MSGTYPE_CHAR
+ || festival_message_type == SPD_MSGTYPE_KEY
+ || festival_message_type == SPD_MSGTYPE_SOUND_ICON){
DBG("Storing record for %s in cache\n", *festival_message);
/* cache_insert takes care of not inserting the same
message again */
@@ -784,9 +784,9 @@ _festival_speak(void* nothing)
int
-is_text(EMessageType msg_type)
+is_text(SPDMessageType msg_type)
{
- if (msg_type == MSGTYPE_TEXT || msg_type == MSGTYPE_SPELL) return 1;
+ if (msg_type == SPD_MSGTYPE_TEXT || msg_type == SPD_MSGTYPE_SPELL) return
1;
else return 0;
}
@@ -986,7 +986,7 @@ cache_clean(size_t new_element_size)
/* Generate a key for searching between the different hash tables */
char*
-cache_gen_key(EMessageType type)
+cache_gen_key(SPDMessageType type)
{
char *key;
char ktype;
@@ -1000,9 +1000,9 @@ cache_gen_key(EMessageType type)
if (FestivalCacheDistinguishPitch) kpitch = msg_settings.pitch;
if (FestivalCacheDistinguishRate) krate = msg_settings.rate;
- if (type == MSGTYPE_CHAR) ktype = 'c';
- else if (type == MSGTYPE_KEY) ktype = 'k';
- else if (type == MSGTYPE_SOUND_ICON) ktype = 's';
+ if (type == SPD_MSGTYPE_CHAR) ktype = 'c';
+ else if (type == SPD_MSGTYPE_KEY) ktype = 'k';
+ else if (type == SPD_MSGTYPE_SOUND_ICON) ktype = 's';
else{
DBG("Invalid message type for cache_gen_key()");
return NULL;
@@ -1016,7 +1016,7 @@ cache_gen_key(EMessageType type)
/* Insert one entry into the cache */
int
-cache_insert(char* key, EMessageType msgtype, FT_Wave *fwave)
+cache_insert(char* key, SPDMessageType msgtype, FT_Wave *fwave)
{
GHashTable *cache;
TCacheEntry *entry;
@@ -1073,7 +1073,7 @@ cache_insert(char* key, EMessageType msgtype, FT_Wave
*fwave)
/* Retrieve wave from the cache */
FT_Wave*
-cache_lookup(const char *key, EMessageType msgtype, int add_counter)
+cache_lookup(const char *key, SPDMessageType msgtype, int add_counter)
{
GHashTable *cache;
TCacheEntry *entry;
diff --git a/src/modules/flite.c b/src/modules/flite.c
index 5bf1247..31ff828 100644
--- a/src/modules/flite.c
+++ b/src/modules/flite.c
@@ -46,7 +46,7 @@ static pthread_t flite_speak_thread;
static sem_t *flite_semaphore;
static char **flite_message;
-static EMessageType flite_message_type;
+static SPDMessageType flite_message_type;
static int flite_position = 0;
static int flite_pause_requested = 0;
@@ -166,7 +166,7 @@ module_list_voices(void)
}
int
-module_speak(gchar *data, size_t bytes, EMessageType msgtype)
+module_speak(gchar *data, size_t bytes, SPDMessageType msgtype)
{
DBG("write()\n");
@@ -182,7 +182,7 @@ module_speak(gchar *data, size_t bytes, EMessageType
msgtype)
*flite_message = NULL;
}
*flite_message = module_strip_ssml(data);
- flite_message_type = MSGTYPE_TEXT;
+ flite_message_type = SPD_MSGTYPE_TEXT;
/* Setting voice */
UPDATE_PARAMETER(rate, flite_set_rate);
diff --git a/src/modules/generic.c b/src/modules/generic.c
index 79fae51..bbce9f0 100644
--- a/src/modules/generic.c
+++ b/src/modules/generic.c
@@ -45,7 +45,7 @@ static pid_t generic_pid;
static sem_t *generic_semaphore;
static char **generic_message;
-static EMessageType generic_message_type;
+static SPDMessageType generic_message_type;
static int generic_position = 0;
static int generic_pause_requested = 0;
@@ -187,7 +187,7 @@ module_list_voices(void)
int
-module_speak(gchar *data, size_t bytes, EMessageType msgtype)
+module_speak(gchar *data, size_t bytes, SPDMessageType msgtype)
{
char *tmp;
@@ -223,7 +223,7 @@ module_speak(gchar *data, size_t bytes, EMessageType
msgtype)
if (tmp == NULL) return -1;
- if (msgtype == MSGTYPE_TEXT)
+ if (msgtype == SPD_MSGTYPE_TEXT)
*generic_message = module_strip_ssml(tmp);
else
*generic_message = g_strdup(tmp);
@@ -231,7 +231,7 @@ module_speak(gchar *data, size_t bytes, EMessageType
msgtype)
module_strip_punctuation_some(*generic_message, GenericStripPunctChars);
- generic_message_type = MSGTYPE_TEXT;
+ generic_message_type = SPD_MSGTYPE_TEXT;
DBG("Requested data: |%s|\n", data);
diff --git a/src/modules/ibmtts.c b/src/modules/ibmtts.c
index 3984dee..3c7dc99 100644
--- a/src/modules/ibmtts.c
+++ b/src/modules/ibmtts.c
@@ -181,7 +181,7 @@ static TIbmttsBool ibmtts_pause_requested = IBMTTS_FALSE;
/* Current message from Speech Dispatcher. */
static char **ibmtts_message;
-static EMessageType ibmtts_message_type;
+static SPDMessageType ibmtts_message_type;
/* ECI */
static ECIHand eciHandle = NULL_ECI_HAND;
@@ -557,7 +557,7 @@ module_list_voices(void)
int
-module_speak(gchar *data, size_t bytes, EMessageType msgtype)
+module_speak(gchar *data, size_t bytes, SPDMessageType msgtype)
{
DBG("Ibmtts: module_speak().");
@@ -586,8 +586,8 @@ module_speak(gchar *data, size_t bytes, EMessageType
msgtype)
}
ibmtts_message_type = msgtype;
- if ((msgtype == MSGTYPE_TEXT) && (msg_settings.spelling_mode ==
SPD_SPELL_ON))
- ibmtts_message_type = MSGTYPE_SPELL;
+ if ((msgtype == SPD_MSGTYPE_TEXT) && (msg_settings.spelling_mode ==
SPD_SPELL_ON))
+ ibmtts_message_type = SPD_MSGTYPE_SPELL;
/* Setting speech parameters. */
UPDATE_STRING_PARAMETER(language, ibmtts_set_language);
@@ -946,10 +946,10 @@ _ibmtts_synth(void* nothing)
pos = *ibmtts_message;
switch (ibmtts_message_type) {
- case MSGTYPE_TEXT:
+ case SPD_MSGTYPE_TEXT:
eciSetParam(eciHandle, eciTextMode, eciTextModeDefault);
break;
- case MSGTYPE_SOUND_ICON:
+ case SPD_MSGTYPE_SOUND_ICON:
/* IBM TTS does not support sound icons.
If we can find a sound icon file, play that,
otherwise speak the name of the sound icon. */
@@ -966,10 +966,10 @@ _ibmtts_synth(void* nothing)
} else
eciSetParam(eciHandle, eciTextMode, eciTextModeDefault);
break;
- case MSGTYPE_CHAR:
+ case SPD_MSGTYPE_CHAR:
eciSetParam(eciHandle, eciTextMode, eciTextModeAllSpell);
break;
- case MSGTYPE_KEY:
+ case SPD_MSGTYPE_KEY:
/* Map unspeakable keys to speakable words. */
DBG("Ibmtts: Key from Speech Dispatcher: |%s|", pos);
pos = ibmtts_subst_keys(pos);
@@ -978,7 +978,7 @@ _ibmtts_synth(void* nothing)
*ibmtts_message = pos;
eciSetParam(eciHandle, eciTextMode, eciTextModeDefault);
break;
- case MSGTYPE_SPELL:
+ case SPD_MSGTYPE_SPELL:
if (SPD_PUNCT_NONE != msg_settings.punctuation_mode)
eciSetParam(eciHandle, eciTextMode, eciTextModeAllSpell);
else
diff --git a/src/modules/ivona.c b/src/modules/ivona.c
index c739d22..25ce763 100644
--- a/src/modules/ivona.c
+++ b/src/modules/ivona.c
@@ -54,7 +54,7 @@ static pthread_t ivona_speak_thread;
static sem_t *ivona_semaphore;
static char **ivona_message;
-static EMessageType ivona_message_type;
+static SPDMessageType ivona_message_type;
signed int ivona_volume = 0;
@@ -62,7 +62,7 @@ signed int ivona_cap_mode=0;
int ivona_punct_mode=0;
/* Internal functions prototypes */
-static int ivona_get_msgpart(struct dumbtts_conf *conf, EMessageType type,
+static int ivona_get_msgpart(struct dumbtts_conf *conf, SPDMessageType type,
char **msg, char *icon, char **buf, int *len,
int cap_mode, char *delimeters, int punct_mode,
char *punct_some);
@@ -185,7 +185,7 @@ module_list_voices(void)
}
int
-module_speak(gchar *data, size_t bytes, EMessageType msgtype)
+module_speak(gchar *data, size_t bytes, SPDMessageType msgtype)
{
DBG("write()\n");
@@ -202,8 +202,8 @@ module_speak(gchar *data, size_t bytes, EMessageType
msgtype)
}
*ivona_message = module_strip_ssml(data);
ivona_message_type = msgtype;
- if ((msgtype == MSGTYPE_TEXT) && (msg_settings.spelling_mode ==
SPD_SPELL_ON))
- ivona_message_type = MSGTYPE_SPELL;
+ if ((msgtype == SPD_MSGTYPE_TEXT) && (msg_settings.spelling_mode ==
SPD_SPELL_ON))
+ ivona_message_type = SPD_MSGTYPE_SPELL;
/* Setting voice */
@@ -309,7 +309,7 @@ static int get_unichar(char **str)
return wc;
}
-static int ivona_get_msgpart(struct dumbtts_conf *conf, EMessageType type,
+static int ivona_get_msgpart(struct dumbtts_conf *conf, SPDMessageType type,
char **msg, char *icon, char **buf, int *len,
int cap_mode, char *delimeters, int punct_mode,
char *punct_some)
@@ -328,7 +328,7 @@ static int ivona_get_msgpart(struct dumbtts_conf *conf,
EMessageType type,
if (*buf) **buf=0;
DBG("Ivona message %s type %d\n",*msg,type);
switch(type) {
- case MSGTYPE_SOUND_ICON:
+ case SPD_MSGTYPE_SOUND_ICON:
if (strlen(*msg)<63) {
strcpy(icon,*msg);
rc=0;
@@ -339,7 +339,7 @@ static int ivona_get_msgpart(struct dumbtts_conf *conf,
EMessageType type,
*msg=NULL;
return rc;
- case MSGTYPE_SPELL:
+ case SPD_MSGTYPE_SPELL:
wc=get_unichar(msg);
if (!wc) {
*msg=NULL;
@@ -358,10 +358,10 @@ static int ivona_get_msgpart(struct dumbtts_conf *conf,
EMessageType type,
if (isicon) strcpy(icon,"capital");
return 0;
- case MSGTYPE_KEY:
- case MSGTYPE_CHAR:
+ case SPD_MSGTYPE_KEY:
+ case SPD_MSGTYPE_CHAR:
- if (type == MSGTYPE_KEY) {
+ if (type == SPD_MSGTYPE_KEY) {
n=dumbtts_KeyString(conf,*msg,*buf,*len,cap_mode,&isicon);
}
else {
@@ -371,7 +371,7 @@ static int ivona_get_msgpart(struct dumbtts_conf *conf,
EMessageType type,
if (n>0) {
*len=n+128;
*buf=g_realloc(*buf,*len);
- if (type == MSGTYPE_KEY) {
+ if (type == SPD_MSGTYPE_KEY) {
n=dumbtts_KeyString(conf,*msg,*buf,*len,cap_mode,&isicon);
}
else {
@@ -383,7 +383,7 @@ static int ivona_get_msgpart(struct dumbtts_conf *conf,
EMessageType type,
if (!n && isicon) strcpy(icon,"capital");
return n;
- case MSGTYPE_TEXT:
+ case SPD_MSGTYPE_TEXT:
pos=0;
bytes=module_get_message_part(*msg,xbuf,&pos, 1023,delimeters);
DBG("Got bytes %d, %s",bytes,xbuf);
diff --git a/src/modules/module_utils.c b/src/modules/module_utils.c
index 05fb244..cc22b7a 100644
--- a/src/modules/module_utils.c
+++ b/src/modules/module_utils.c
@@ -34,7 +34,7 @@ static char* module_audio_pars[10];
extern char* module_index_mark;
char*
-do_message(EMessageType msgtype)
+do_message(SPDMessageType msgtype)
{
int ret;
char *cur_line;
@@ -68,11 +68,11 @@ do_message(EMessageType msgtype)
}
- if ((msgtype != MSGTYPE_TEXT) && (nlines > 2)){
+ if ((msgtype != SPD_MSGTYPE_TEXT) && (nlines > 2)){
return g_strdup("305 DATA MORE THAN ONE LINE");
}
- if ((msgtype == MSGTYPE_CHAR) && (!strcmp(msg->str,"space"))){
+ if ((msgtype == SPD_MSGTYPE_CHAR) && (!strcmp(msg->str,"space"))){
g_string_free(msg, 1);
msg = g_string_new(" ");
}
@@ -95,25 +95,25 @@ do_message(EMessageType msgtype)
char*
do_speak(void)
{
- return do_message(MSGTYPE_TEXT);
+ return do_message(SPD_MSGTYPE_TEXT);
}
char*
do_sound_icon(void)
{
- return do_message(MSGTYPE_SOUND_ICON);
+ return do_message(SPD_MSGTYPE_SOUND_ICON);
}
char*
do_char(void)
{
- return do_message(MSGTYPE_CHAR);
+ return do_message(SPD_MSGTYPE_CHAR);
}
char*
do_key(void)
{
- return do_message(MSGTYPE_KEY);
+ return do_message(SPD_MSGTYPE_KEY);
}
void
@@ -569,7 +569,7 @@ void
module_speak_thread_wfork(sem_t *semaphore, pid_t *process_pid,
TChildFunction child_function,
TParentFunction parent_function,
- int *speaking_flag, char **message, const
EMessageType *msgtype,
+ int *speaking_flag, char **message, const
SPDMessageType *msgtype,
const size_t maxlen, const char *dividers, size_t
*module_position,
int *pause_requested)
{
@@ -638,7 +638,7 @@ module_speak_thread_wfork(sem_t *semaphore, pid_t
*process_pid,
}
size_t
-module_parent_wfork(TModuleDoublePipe dpipe, const char* message, EMessageType
msgtype,
+module_parent_wfork(TModuleDoublePipe dpipe, const char* message,
SPDMessageType msgtype,
const size_t maxlen, const char* dividers, int
*pause_requested)
{
unsigned int pos = 0;
diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h
index cea5aa3..aa7020c 100644
--- a/src/modules/module_utils.h
+++ b/src/modules/module_utils.h
@@ -140,7 +140,7 @@ int module_load (void);
int module_init (char **status_info);
int module_audio_init_spd (char **status_info);
SPDVoice** module_list_voices(void);
-int module_speak (char *data, size_t bytes, EMessageType msgtype);
+int module_speak (char *data, size_t bytes, SPDMessageType msgtype);
int module_stop (void);
SPDVoice** module_get_voices (void);
size_t module_pause (void);
@@ -204,7 +204,7 @@ void module_sigblockall(void);
void module_sigblockusr(sigset_t *signal_set);
void module_sigunblockusr(sigset_t *signal_set);
-char* do_message(EMessageType msgtype);
+char* do_message(SPDMessageType msgtype);
char* do_speak(void);
char* do_sound_icon(void);
char* do_char(void);
@@ -221,17 +221,17 @@ void do_quit(void);
typedef void (*TChildFunction)(TModuleDoublePipe dpipe, const size_t maxlen);
typedef size_t (*TParentFunction)(TModuleDoublePipe dpipe, const char* message,
- const EMessageType msgtype, const size_t
maxlen,
+ const SPDMessageType msgtype, const size_t
maxlen,
const char* dividers, int *pause_requested);
void module_speak_thread_wfork(sem_t *semaphore, pid_t *process_pid,
TChildFunction child_function,
TParentFunction parent_function,
- int *speaking_flag, char **message, const
EMessageType *msgtype,
+ int *speaking_flag, char **message, const
SPDMessageType *msgtype,
const size_t maxlen, const char *dividers, size_t
*module_position,
int *pause_requested);
-size_t module_parent_wfork(TModuleDoublePipe dpipe, const char* message,
EMessageType msgtype,
+size_t module_parent_wfork(TModuleDoublePipe dpipe, const char* message,
SPDMessageType msgtype,
const size_t maxlen, const char* dividers, int
*pause_requested);
int module_parent_wait_continue(TModuleDoublePipe dpipe);
diff --git a/src/modules/pico.c b/src/modules/pico.c
index 96df5de..4a508b4 100644
--- a/src/modules/pico.c
+++ b/src/modules/pico.c
@@ -486,7 +486,7 @@ static void pico_set_language(char *lang)
return;
}
-int module_speak(char * data, size_t bytes, EMessageType msgtype)
+int module_speak(char * data, size_t bytes, SPDMessageType msgtype)
{
int value;
static pico_Char *tmp;
diff --git a/src/server/output.c b/src/server/output.c
index bf89aa6..8c393d4 100644
--- a/src/server/output.c
+++ b/src/server/output.c
@@ -543,10 +543,10 @@ output_speak(TSpeechDMessage *msg)
switch(msg->settings.type)
{
- case MSGTYPE_TEXT: SEND_CMD("SPEAK") break;
- case MSGTYPE_SOUND_ICON: SEND_CMD("SOUND_ICON"); break;
- case MSGTYPE_CHAR: SEND_CMD("CHAR"); break;
- case MSGTYPE_KEY: SEND_CMD("KEY"); break;
+ case SPD_MSGTYPE_TEXT: SEND_CMD("SPEAK") break;
+ case SPD_MSGTYPE_SOUND_ICON: SEND_CMD("SOUND_ICON"); break;
+ case SPD_MSGTYPE_CHAR: SEND_CMD("CHAR"); break;
+ case SPD_MSGTYPE_KEY: SEND_CMD("KEY"); break;
default: MSG(2,"Invalid message type in output_speak()!");
}
diff --git a/src/server/parse.c b/src/server/parse.c
index 2f26089..0626e31 100644
--- a/src/server/parse.c
+++ b/src/server/parse.c
@@ -179,7 +179,7 @@ parse(const char *buf, const int bytes, const int fd)
new->buf = deescape_dot(speechd_socket->o_buf->str, new->bytes);
reparted = speechd_socket->inside_block;
MSG(5, "New buf is now: |%s|", new->buf);
- if((msg_uid = queue_message(new, fd, 1, MSGTYPE_TEXT, reparted))
== 0){
+ if((msg_uid = queue_message(new, fd, 1, SPD_MSGTYPE_TEXT,
reparted)) == 0){
if(SPEECHD_DEBUG) FATAL("Can't queue message\n");
g_free(new->buf);
g_free(new);
@@ -754,7 +754,7 @@ parse_resume(const char *buf, const int bytes, const int
fd, const TSpeechDSock
}
char*
-parse_general_event(const char *buf, const int bytes, const int fd, const
TSpeechDSock* speechd_socket, EMessageType type)
+parse_general_event(const char *buf, const int bytes, const int fd, const
TSpeechDSock* speechd_socket, SPDMessageType type)
{
char *param;
TSpeechDMessage *msg;
@@ -795,19 +795,19 @@ parse_general_event(const char *buf, const int bytes,
const int fd, const TSpeec
char*
parse_snd_icon(const char *buf, const int bytes, const int fd, const
TSpeechDSock *speechd_socket)
{
- return parse_general_event(buf, bytes, fd, speechd_socket,
MSGTYPE_SOUND_ICON);
+ return parse_general_event(buf, bytes, fd, speechd_socket,
SPD_MSGTYPE_SOUND_ICON);
}
char*
parse_char(const char *buf, const int bytes, const int fd, const TSpeechDSock
*speechd_socket)
{
- return parse_general_event(buf, bytes, fd, speechd_socket, MSGTYPE_CHAR);
+ return parse_general_event(buf, bytes, fd, speechd_socket,
SPD_MSGTYPE_CHAR);
}
char*
parse_key(const char* buf, const int bytes, const int fd, const TSpeechDSock
*speechd_socket)
{
- return parse_general_event(buf, bytes, fd, speechd_socket, MSGTYPE_KEY);
+ return parse_general_event(buf, bytes, fd, speechd_socket,
SPD_MSGTYPE_KEY);
}
char*
diff --git a/src/server/parse.h b/src/server/parse.h
index 270aec8..ed21552 100644
--- a/src/server/parse.h
+++ b/src/server/parse.h
@@ -25,7 +25,7 @@ char* get_param(const char *buf, const int n, const int
bytes, const int lower_c
/* Other internal functions */
char* parse_general_event(const char *buf, const int bytes, const int fd,
const TSpeechDSock* speechd_socket,
- EMessageType type);
+ SPDMessageType type);
int spd_utf8_read_char(char* pointer, char* character);
#endif
diff --git a/src/server/server.c b/src/server/server.c
index e542ed6..1f08224 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -65,7 +65,7 @@ this message is a part of a reparted message (one of a block
of messages). */
int
queue_message(TSpeechDMessage *new, int fd, int history_flag,
- EMessageType type, int reparted)
+ SPDMessageType type, int reparted)
{
TFDSetElement *settings;
TSpeechDMessage *hist_msg, *message_copy;
diff --git a/src/server/server.h b/src/server/server.h
index 9aeec0c..f52e419 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -34,7 +34,7 @@ void server_data_off(int fd);
/* Put a message into Dispatcher's queue */
int queue_message(TSpeechDMessage *new, int fd, int history_flag,
- EMessageType type, int reparted);
+ SPDMessageType type, int reparted);
#endif
diff --git a/src/server/speaking.c b/src/server/speaking.c
index 150bbc6..b7f4988 100644
--- a/src/server/speaking.c
+++ b/src/server/speaking.c
@@ -188,7 +188,7 @@ speak(void* data)
}
/* Insert index marks into textual messages */
- if(message->settings.type == MSGTYPE_TEXT){
+ if(message->settings.type == SPD_MSGTYPE_TEXT){
insert_index_marks(message, message->settings.ssml_mode);
}
@@ -305,7 +305,7 @@ reload_message(TSpeechDMessage *msg)
msg->buf = newtext;
msg->bytes = strlen(msg->buf);
- if(queue_message(msg, -msg->settings.uid, 0, MSGTYPE_TEXT, 0) == 0){
+ if(queue_message(msg, -msg->settings.uid, 0, SPD_MSGTYPE_TEXT, 0) ==
0){
if(SPEECHD_DEBUG) FATAL("Can't queue message\n");
g_free(msg->buf);
g_free(msg);
@@ -316,7 +316,7 @@ reload_message(TSpeechDMessage *msg)
}else{
MSG(5, "Index mark unknown, inserting the whole message.");
- if(queue_message(msg, -msg->settings.uid, 0, MSGTYPE_TEXT, 0) == 0){
+ if(queue_message(msg, -msg->settings.uid, 0, SPD_MSGTYPE_TEXT, 0) ==
0){
if(SPEECHD_DEBUG) FATAL("Can't queue message\n");
g_free(msg->buf);
g_free(msg);
diff --git a/src/server/speechd.h b/src/server/speechd.h
index 8aeb7ed..ebba274 100644
--- a/src/server/speechd.h
+++ b/src/server/speechd.h
@@ -78,7 +78,7 @@ typedef struct{
int active; /* Is this client still active on socket or
gone?*/
int paused; /* Internal flag, 1 for paused client or 0 for
normal. */
int paused_while_speaking;
- EMessageType type; /* Type of the message (1=text, 2=icon,
3=char, 4=key) */
+ SPDMessageType type; /* Type of the message (1=text, 2=icon,
3=char, 4=key) */
SPDDataMode ssml_mode; /* SSML mode on (1)/off (0) */
SPDPriority priority; /* Priority between 1 and 5 (1 - highest, 5 -
lowest) */
signed int rate; /* Speed of voice from <-100;+100>, 0 is the
default */
--
1.6.0.4
- [PATCH 1/4] rename EMessageType to SPDMessageType,
Andrei Kholodnyi <=