[PATCH 3/4] move SPDMsgSettings to the modules

[william hubbs]

From: William Hubbs <address@hidden>
To: address@hidden

This type is only used in the modules and does not need to be shared.
---
 doc/speech-dispatcher.texi |   16 ++++++----------
 intl/fdset.h               |   15 ---------------
 src/modules/module_utils.h |   15 +++++++++++++++
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/doc/speech-dispatcher.texi b/doc/speech-dispatcher.texi
index ff609ca..36695bc 100644
--- a/doc/speech-dispatcher.texi
+++ b/doc/speech-dispatcher.texi
@@ -2830,23 +2830,21 @@ in order for us to be in a better legal position 
against possible intruders.
 @node The Skeleton of an Output Module, Output Module Functions, How to Write 
New Output Module, Output Modules
 @subsection The Skeleton of an Output Module 
 
-Each output module should include @file{intl/fdset.h} where the
+Each output module should include @file{module_utils.h} where the
 SPDMsgSettings structure is defined to be able to handle the different
-speech synthesis settings.
+speech synthesis settings.  This file also provides tools which help
+with writing output modules and making the code simpler.
 
 @example
-#include "fdset.h"
+#include "module_utils.h"
 @end example
 
-Additionally, it's also reccomended to include @file{module_utils.h}
-which provides many tools to help writing output modules and make the
-code simpler. If your plugin needs the audio tools (if you take
+If your plugin needs the audio tools (if you take
 care of the output to the soundcard instead of the synthesizer),
 you also have to include @file{spd_audio.h}
 
 @example
-#include "module_utils.h"
-#include "spd_audio.c"
+#include "spd_audio.h"
 @end example
 
 The definition of macros @code{MODULE_NAME} and @code{MODULE_VERSION}
@@ -3070,8 +3068,6 @@ the name of the language according to RFC 1776 (en, cs, 
fr, ...). If the
 requested language is not supported by this synthesizer, it's ok to abort
 and return 0, because that's an error in user settings.
 
-Other parameters are defined in @code{SPDMsgSettings} in @file{intl/fdset.h}.
-
 An easy way to set the parameters is using the UPDATE_PARAMETER() and
 UPDATE_STRING_PARAMETER() macros. @xref{Module Utils Functions and
 Macros}.
diff --git a/intl/fdset.h b/intl/fdset.h
index 2af785c..21b10d7 100644
--- a/intl/fdset.h
+++ b/intl/fdset.h
@@ -90,19 +90,4 @@ typedef struct {
   char* dialect;
 }VoiceDescription;
 
-typedef struct{
-    signed int rate;
-    signed int pitch;
-    signed int volume;
-    
-    EPunctMode punctuation_mode;
-    ESpellMode spelling_mode;
-    ECapLetRecogn cap_let_recogn;
-
-    char* language;
-
-    EVoiceType voice;
-    char *synthesis_voice;
-}SPDMsgSettings;
-
 #endif /* not ifndef FDSET */
diff --git a/src/modules/module_utils.h b/src/modules/module_utils.h
index 99a23d5..9354ea8 100644
--- a/src/modules/module_utils.h
+++ b/src/modules/module_utils.h
@@ -47,6 +47,21 @@
 #include "fdset.h"
 #include "spd_audio.h"
 
+typedef struct{
+    signed int rate;
+    signed int pitch;
+    signed int volume;
+    
+    EPunctMode punctuation_mode;
+    ESpellMode spelling_mode;
+    ECapLetRecogn cap_let_recogn;
+
+    char* language;
+
+    EVoiceType voice;
+    char *synthesis_voice;
+}SPDMsgSettings;
+
 int log_level;
 
 AudioID *module_audio_id;
-- 
1.7.2.2