Put voice settings in a subtree of.

Rename speech settings tree.
Get speech substitutions from settings.

git-svn-id: https://radegast.googlecode.com/svn/trunk@424 f7a694da-4d33-11de-9ad6-1127a62b9fcd

diff --git a/Radegast/GUI/Consoles/VoiceConsole.cs b/Radegast/GUI/Consoles/VoiceConsole.cs
index 31073b0..71e0b5d 100644 (file)
--- a/Radegast/GUI/Consoles/VoiceConsole.cs
+++ b/Radegast/GUI/Consoles/VoiceConsole.cs
@@ -38,6 +38,7 @@ using System.Windows.Forms;
 using Radegast.Netcom;\r
 using Radegast.Core;\r
 using OpenMetaverse;\r
+using OpenMetaverse.StructuredData;\r
 \r
 namespace Radegast\r
 {\r
@@ -55,7 +56,7 @@ namespace Radegast
         private RadegastNetcom netcom { get { return instance.Netcom; } }\r
         private GridClient client { get { return instance.Client; } }\r
         private TabsConsole tabConsole;\r
-\r
+        private OSDMap config;\r
         public VoiceGateway gateway;\r
         public VoiceSession session;\r
 \r
@@ -73,7 +74,16 @@ namespace Radegast
 \r
             this.instance.MainForm.Load += new EventHandler(MainForm_Load);\r
 \r
-            chkVoiceEnable.Checked = instance.GlobalSettings["Voice.enabled"].AsBoolean();\r
+            config = instance.GlobalSettings["voice"] as OSDMap;\r
+            if (config == null)\r
+            {\r
+                config = new OSDMap();\r
+                config["enabled"] = new OSDBoolean(false);\r
+                instance.GlobalSettings["voice"] = config;\r
+                instance.GlobalSettings.Save();\r
+            }\r
+\r
+            chkVoiceEnable.Checked = config["enabled"].AsBoolean();\r
             if (chkVoiceEnable.Checked)\r
                 Start();\r
         }\r
@@ -330,28 +340,28 @@ namespace Radegast
 \r
             foreach (string name in available)\r
                 micDevice.Items.Add(name);\r
-            micDevice.SelectedItem = instance.GlobalSettings["Voice.capture.device"].AsString();\r
+            micDevice.SelectedItem = config["capture.device"].AsString();\r
         }\r
 \r
         void LoadSpkrDevices(List<string> available)\r
         {\r
             foreach (string name in available)\r
                 spkrDevice.Items.Add(name);\r
-            spkrDevice.SelectedItem = instance.GlobalSettings["Voice.playback.device"].AsString();\r
+            spkrDevice.SelectedItem = config["playback.device"].AsString();\r
         }\r
 \r
         private void spkrDevice_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             gateway.PlaybackDevice = (string)spkrDevice.SelectedItem;\r
-            instance.GlobalSettings["Voice.playback.device"] =\r
-                OpenMetaverse.StructuredData.OSD.FromString((string)spkrDevice.SelectedItem);\r
+            config["playback.device"] = new OSDString((string)spkrDevice.SelectedItem);\r
+            instance.GlobalSettings.Save();\r
         }\r
 \r
         private void micDevice_SelectedIndexChanged(object sender, EventArgs e)\r
         {\r
             gateway.CaptureDevice = (string)micDevice.SelectedItem;\r
-            instance.GlobalSettings["Voice.capture.device"] =\r
-               OpenMetaverse.StructuredData.OSD.FromString((string)micDevice.SelectedItem);\r
+            config["capture.device"] = new OSDString((string)micDevice.SelectedItem);\r
+            instance.GlobalSettings.Save();\r
         }\r
 \r
         private void micLevel_ValueChanged(object sender, EventArgs e)\r
@@ -372,8 +382,8 @@ namespace Radegast
         {\r
             this.BeginInvoke(new MethodInvoker(delegate()\r
             {\r
-                instance.GlobalSettings["Voice.enabled"] =\r
-                    OpenMetaverse.StructuredData.OSD.FromBoolean(chkVoiceEnable.Checked);\r
+                config["enabled"] = new OSDBoolean( chkVoiceEnable.Checked );\r
+                instance.GlobalSettings.Save();\r
 \r
                 if (chkVoiceEnable.Checked)\r
                 {\r

diff --git a/plugins/Radegast.Plugin.Speech/RadSpeech/PluginControl.cs b/plugins/Radegast.Plugin.Speech/RadSpeech/PluginControl.cs
index 4fb5db8..5fbc097 100644 (file)
--- a/plugins/Radegast.Plugin.Speech/RadSpeech/PluginControl.cs
+++ b/plugins/Radegast.Plugin.Speech/RadSpeech/PluginControl.cs
@@ -73,7 +73,8 @@ namespace RadegastSpeech
                 config["voices"] = new OSDMap();\r
                 config["properties"] = new OSDMap();\r
                 config["substitutions"] = new OSDMap();\r
-                instance.GlobalSettings["plugin.voice"] = config;\r
+                instance.GlobalSettings["plugin.speech"] = config;\r
+                instance.GlobalSettings.Save();\r
             }\r
 \r
             // Do the one-time only initializations.\r

diff --git a/plugins/Radegast.Plugin.Speech/RadSpeech/Talk/Substitutions.cs b/plugins/Radegast.Plugin.Speech/RadSpeech/Talk/Substitutions.cs
index 831074e..5378c92 100644 (file)
--- a/plugins/Radegast.Plugin.Speech/RadSpeech/Talk/Substitutions.cs
+++ b/plugins/Radegast.Plugin.Speech/RadSpeech/Talk/Substitutions.cs
@@ -41,9 +41,9 @@ namespace RadegastSpeech.Talk
             OSDMap subs = pc.config["substitutions"] as OSDMap;\r
             if (subs != null)\r
             {\r
-                foreach (System.Collections.DictionaryEntry entry in subs)\r
+                foreach (string key in subs.Keys)\r
                 {\r
-                    Add((string)entry.Key, (string)entry.Value);\r
+                    Add( key, subs[key].AsString() );\r
                 }\r
             }\r
 \r

diff --git a/plugins/Radegast.Plugin.Speech/RadSpeechLin/LinSpeech.cs b/plugins/Radegast.Plugin.Speech/RadSpeechLin/LinSpeech.cs
index 72fd97a..879031d 100644 (file)
--- a/plugins/Radegast.Plugin.Speech/RadSpeechLin/LinSpeech.cs
+++ b/plugins/Radegast.Plugin.Speech/RadSpeechLin/LinSpeech.cs
@@ -22,6 +22,9 @@ namespace RadegastSpeech
         // Speech recognition is not yet available on Linux\r
         public void RecogStart()\r
         {\r
+            if (OnRecognition != null) // Supress compiler wanring until we have something for this\r
+            {\r
+            }\r
         }\r
 \r
         public void RecogStop()\r

diff --git a/plugins/Radegast.Plugin.Speech/RadSpeechMac/MacSpeech.cs b/plugins/Radegast.Plugin.Speech/RadSpeechMac/MacSpeech.cs
index 5ddf087..549542b 100644 (file)
--- a/plugins/Radegast.Plugin.Speech/RadSpeechMac/MacSpeech.cs
+++ b/plugins/Radegast.Plugin.Speech/RadSpeechMac/MacSpeech.cs
@@ -23,6 +23,9 @@ namespace RadegastSpeech
         public void SpeechStart( PluginControl pc, string[] beeps)\r
         {\r
             synth = new MacSynth( pc, beeps);\r
+            if (OnRecognition != null)\r
+            {\r
+            }\r
         }\r
 \r
         public void SpeechStop()\r
@@ -48,6 +51,9 @@ namespace RadegastSpeech
 \r
         public void RecogStart()\r
         {\r
+            if (OnRecognition != null) // Supress compiler wanring until we have something for this\r
+            {\r
+            }\r
         }\r
 \r
         public void RecogStop()\r