Clean up announcement / selection of voices

CaffeineAU · Jul 31, 2017 · bb633d1 · bb633d1
1 parent 91ce21b
commit bb633d1
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 47 deletions.
diff --git a/Translator/MainWindow.xaml.cs b/Translator/MainWindow.xaml.cs
@@ -125,6 +125,11 @@ public TTSProvider SelectedEngine
             {
                 selectedEngine = value;
                 Properties.Settings.Default.LastTTSProvider = SelectedEngine.Name;
+                if (SelectedEngine.AvailableVoices.Count > 0)
+                {
+                    SelectedEngine.SelectedVoice = SelectedEngine.AvailableVoices[0];
+
+                }
                 OnPropertyChanged("SelectedEngine");
                 CheckFolderForVoices();
 

diff --git a/Translator/TTSProvider/AmazonPollyProvider.cs b/Translator/TTSProvider/AmazonPollyProvider.cs
@@ -34,49 +34,37 @@ public AmazonPollyTTSProvider()
             {
                 try
                 {
-                    //List<Amazon.Polly.Model.Voice> availableVoices = polly.DescribeVoices(new Amazon.Polly.Model.DescribeVoicesRequest()).Voices;
                     foreach (var v in polly.DescribeVoices(new Amazon.Polly.Model.DescribeVoicesRequest()).Voices)
                     {
                         AvailableVoices.Add(new Voice { Name = v.Name, Gender = v.Gender.ToString(), Language = v.LanguageName });
                     }
 
-                    //foreach (var item in availableVoices)
-                    //{
-                    //    AvailableVoices.Add(new TTSAutomate.Voice { Name = item.Name, Gender = item.Gender, Language = item.LanguageName });
-                    //}
-                    if (Properties.Settings.Default.RememberLanguageSettings && this.Name == Properties.Settings.Default.LastTTSProvider)
+                    if (this.Name == Properties.Settings.Default.LastTTSProvider)
                     {
-                        SelectedVoice = AvailableVoices.Find(n => n.Name == Properties.Settings.Default.LastTTSVoice);
-                    }
-                    else
-                    {
-                        SelectedVoice = AvailableVoices[0];
+                        if (Properties.Settings.Default.RememberLanguageSettings)
+                        {
+                            SelectedVoice = AvailableVoices.Find(n => n.Name == Properties.Settings.Default.LastTTSVoice);
+                        }
+                        else
+                        {
+                            SelectedVoice = AvailableVoices[0];
+                        }
                     }
                 }
                 catch (Exception Ex)
                 {
+                    Logger.Log(Ex.ToString());
                     AvailableVoices.Add(new Voice { Name = "Amazon Polly Voices are Disabled", Language = "en-US", Gender = "None"});
                     SelectedVoice = AvailableVoices[0];
                     disabled = true;
                 }
             };
             loadVoicesWorker.RunWorkerAsync();
 
-            AvailableSpeeds.AddRange(new String[] { "x-slow", "slow", "medium", "fast", "x-fast" });
-            SelectedDiscreteSpeed = "medium";
-
-            AvailableVolumes.AddRange(new String[] { "silent", "x-soft", "soft", "medium", "loud", "x-loud" });
-            SelectedDiscreteVolume = "medium";
         }
 
         public override void DownloadItem(PhraseItem item, string folder)
         {
-            //            String SSMLText = String.Format(@"
-            //<?xml version=""1.0""?>
-            //<speak xml:lang=""en - US"" onlangfailure=""processorchoice"" xmlns=""http://www.w3.org/2001/10/synthesis"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"">
-            //  {0}
-            //</speak >
-            //", item.Phrase.Replace("&", "&amp;"));
             String SSMLText = String.Format(@"
 <speak>
   {0}
@@ -111,12 +99,6 @@ public override void DownloadItem(PhraseItem item, string folder)
 
         public override void DownloadAndPlayItem(PhraseItem item, string folder)
         {
-//            String SSMLText = String.Format(@"
-//<?xml version=""1.0""?>
-//<speak xml:lang=""en - US"" onlangfailure=""processorchoice"" xmlns=""http://www.w3.org/2001/10/synthesis"" xmlns:xsi=""http://www.w3.org/2001/XMLSchema-instance"">
-//  {0}
-//</speak >
-//", item.Phrase.Replace("&", "&amp;"));
             String SSMLText = String.Format(@"
 <speak>
   {0}

diff --git a/Translator/TTSProvider/GoogleTTSProvider.cs b/Translator/TTSProvider/GoogleTTSProvider.cs
@@ -28,13 +28,16 @@ public GoogleTTSProvider()
                 cultures.AddRange(CultureInfo.GetCultures(CultureTypes.SpecificCultures));
                 cultures.Sort((x, y) => x.DisplayName.CompareTo(y.DisplayName));
                 AvailableVoices = cultures.Select(x => new Voice() { Name = x.DisplayName, Language = x.Name }).ToList();
-                if (Properties.Settings.Default.RememberLanguageSettings && this.Name == Properties.Settings.Default.LastTTSProvider)
+                if (this.Name == Properties.Settings.Default.LastTTSProvider)
                 {
-                    SelectedVoice = AvailableVoices.Find(n => n.Name == Properties.Settings.Default.LastTTSVoice);
-                }
-                else
-                {
-                    SelectedVoice = AvailableVoices[0];
+                    if (Properties.Settings.Default.RememberLanguageSettings)
+                    {
+                        SelectedVoice = AvailableVoices.Find(n => n.Name == Properties.Settings.Default.LastTTSVoice);
+                    }
+                    else
+                    {
+                        SelectedVoice = AvailableVoices[0];
+                    }
                 }
 
             };

diff --git a/Translator/TTSProvider/IvonaTTSProvider.cs b/Translator/TTSProvider/IvonaTTSProvider.cs
@@ -29,15 +29,17 @@ public IvonaTTSProvider()
                 try
                 {
                     AvailableVoices = IvonaListVoices().Voices;
-                    if (Properties.Settings.Default.RememberLanguageSettings && this.Name == Properties.Settings.Default.LastTTSProvider)
+                    if (this.Name == Properties.Settings.Default.LastTTSProvider)
                     {
-                        SelectedVoice = AvailableVoices.Find(n => n.Name == Properties.Settings.Default.LastTTSVoice);
-                    }
-                    else
-                    {
-                        SelectedVoice = AvailableVoices[0];
+                        if (Properties.Settings.Default.RememberLanguageSettings)
+                        {
+                            SelectedVoice = AvailableVoices.Find(n => n.Name == Properties.Settings.Default.LastTTSVoice);
+                        }
+                        else
+                        {
+                            SelectedVoice = AvailableVoices[0];
+                        }
                     }
-
                 }
                 catch (Exception Ex)
                 {

diff --git a/Translator/TTSProvider/MicrosoftTTSProvider.cs b/Translator/TTSProvider/MicrosoftTTSProvider.cs
@@ -33,13 +33,16 @@ public MicrosoftTTSProvider()
                 {
                     AvailableVoices.Add(new Voice { Name = v.Name, Gender = v.Gender.ToString(), Language = v.Culture.Name});
                 }
-                if (Properties.Settings.Default.RememberLanguageSettings && this.Name == Properties.Settings.Default.LastTTSProvider)
+                if (this.Name == Properties.Settings.Default.LastTTSProvider)
                 {
-                    SelectedVoice = AvailableVoices.Find(n => n.Name == Properties.Settings.Default.LastTTSVoice);
-                }
-                else
-                {
-                    SelectedVoice = AvailableVoices[0];
+                    if (Properties.Settings.Default.RememberLanguageSettings)
+                    {
+                        SelectedVoice = AvailableVoices.Find(n => n.Name == Properties.Settings.Default.LastTTSVoice);
+                    }
+                    else
+                    {
+                        SelectedVoice = AvailableVoices[0];
+                    }
                 }
             }).Start();