[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/4] move TFDSetElement and TFDSetClientSpecific to the server
From: |
william hubbs |
Subject: |
[PATCH 2/4] move TFDSetElement and TFDSetClientSpecific to the server |
Date: |
Mon, 13 Sep 2010 17:47:41 -0500 |
From: William Hubbs <address@hidden>
To: address@hidden
These types are only used in server code, so they do not need to be shared.
---
intl/fdset.h | 53 --------------------------------------------------
src/server/speechd.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/intl/fdset.h b/intl/fdset.h
index 8b337dc..2af785c 100644
--- a/intl/fdset.h
+++ b/intl/fdset.h
@@ -90,59 +90,6 @@ typedef struct {
char* dialect;
}VoiceDescription;
-
-typedef struct{
- unsigned int uid; /* Unique ID of the client */
- int fd; /* File descriptor the client is on. */
- 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) */
- int ssml_mode; /* SSML mode on (1)/off (0) */
- int priority; /* Priority between 1 and 3 (1 - highest, 3 -
lowest) */
- signed int rate; /* Speed of voice from <-100;+100>, 0 is the
default */
- signed int pitch; /* Pitch of voice from <-100;+100>, 0 is the
default */
- signed int volume; /* Volume of voice from <-100;+100), 0 is the
default */
- EPunctMode punctuation_mode; /* Punctuation mode: 0, 1 or 2
- 0 - no punctuation
- 1 - all punctuation
- 2 - only user-selected punctuation
*/
- ESpellMode spelling_mode; /* Spelling mode: 0 or 1 (0 - off, 1 - on) */
- char *client_name; /* Name of the client. */
- char *language; /* Selected language name. (e.g. "en", "cz",
"fr", ...) */
- char *output_module; /* Output module name. (e.g. "festival",
"flite", "apollo", ...) */
- EVoiceType voice; /* see EVoiceType definition above */
- char *synthesis_voice;
- ECapLetRecogn cap_let_recogn; /* Capital letters recognition: (0 -
off, 1 - on) */
-
- ENotification notification; /* Notification about start and stop of
messages, about reached
- index marks and state (canceled, paused,
resumed). */
-
- int reparted;
- unsigned int min_delay_progress;
- int pause_context; /* Number of words that should be repeated
after a pause */
- char* index_mark; /* Current index mark for the message (only if
paused) */
-
- char* audio_output_method;
- char* audio_oss_device;
- char* audio_alsa_device;
- char* audio_nas_server;
- char* audio_pulse_server;
- int audio_pulse_min_length;
- int log_level;
-
- /* TODO: Should be moved out */
- unsigned int hist_cur_uid;
- int hist_cur_pos;
- ESort hist_sorted;
-
-}TFDSetElement;
-
-typedef struct{
- char *pattern;
- TFDSetElement val;
-}TFDSetClientSpecific;
-
typedef struct{
signed int rate;
signed int pitch;
diff --git a/src/server/speechd.h b/src/server/speechd.h
index f1a2525..f59bfda 100644
--- a/src/server/speechd.h
+++ b/src/server/speechd.h
@@ -72,6 +72,58 @@ union semun {
#include "module.h"
#include "compare.h"
+typedef struct{
+ unsigned int uid; /* Unique ID of the client */
+ int fd; /* File descriptor the client is on. */
+ 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) */
+ int ssml_mode; /* SSML mode on (1)/off (0) */
+ int priority; /* Priority between 1 and 3 (1 - highest, 3 -
lowest) */
+ signed int rate; /* Speed of voice from <-100;+100>, 0 is the
default */
+ signed int pitch; /* Pitch of voice from <-100;+100>, 0 is the
default */
+ signed int volume; /* Volume of voice from <-100;+100), 0 is the
default */
+ EPunctMode punctuation_mode; /* Punctuation mode: 0, 1 or 2
+ 0 - no punctuation
+ 1 - all punctuation
+ 2 - only user-selected punctuation
*/
+ ESpellMode spelling_mode; /* Spelling mode: 0 or 1 (0 - off, 1 - on) */
+ char *client_name; /* Name of the client. */
+ char *language; /* Selected language name. (e.g. "en", "cz",
"fr", ...) */
+ char *output_module; /* Output module name. (e.g. "festival",
"flite", "apollo", ...) */
+ EVoiceType voice; /* see EVoiceType definition above */
+ char *synthesis_voice;
+ ECapLetRecogn cap_let_recogn; /* Capital letters recognition: (0 -
off, 1 - on) */
+
+ ENotification notification; /* Notification about start and stop of
messages, about reached
+ index marks and state (canceled, paused,
resumed). */
+
+ int reparted;
+ unsigned int min_delay_progress;
+ int pause_context; /* Number of words that should be repeated
after a pause */
+ char* index_mark; /* Current index mark for the message (only if
paused) */
+
+ char* audio_output_method;
+ char* audio_oss_device;
+ char* audio_alsa_device;
+ char* audio_nas_server;
+ char* audio_pulse_server;
+ int audio_pulse_min_length;
+ int log_level;
+
+ /* TODO: Should be moved out */
+ unsigned int hist_cur_uid;
+ int hist_cur_pos;
+ ESort hist_sorted;
+
+}TFDSetElement;
+
+typedef struct{
+ char *pattern;
+ TFDSetElement val;
+}TFDSetClientSpecific;
+
/* Size of the buffer for socket communication */
#define BUF_SIZE 128
--
1.7.2.2