Convert to mono

.gitignore

@@ -4,8 +4,11 @@ packages/
 *.pdb
 *.txt
 *.cache
+bin/
+obj/
 Debug/
 Debug\
+packages/
 Setup_FastScript/Setup_FastScript/Express/DVD-5/Reports/
 Setup_FastScript/Setup_FastScript/Express/DVD-5/LogFiles/
-
+environmentVariables.sh 

Fast Script/AudioFileMaker.cs

@@ -3,26 +3,27 @@
 using System.Linq;
 using System.Text;
 using System.IO;
-using System.Speech.Synthesis;
-using System.Speech.AudioFormat;
-using Yeti.MMedia;
-using Yeti.MMedia.Mp3;
-using WaveLib;
+//using System.Speech.Synthesis;
+//using System.Speech.AudioFormat;
+//using Yeti.MMedia;
+//using Yeti.MMedia.Mp3;
+//using WaveLib;
 using System.ComponentModel;
 using Orvis.Framework.Exception;
 
 namespace Fast_Script
 {
-    class AudioFileMaker
+    class AudioFileMaker : IAudioGenerator
     {
-        static public void MakeFileFromText(string fileNameToCreate, string textToConvert, string voiceName, int voiceRate, BackgroundWorker worker)
+        public void MakeFileFromText(string fileNameToCreate, string textToConvert, string voiceName, int voiceRate, BackgroundWorker worker)
         {
             Stream audioStream = textToAudioStream(textToConvert, voiceName, voiceRate, worker);    // get audio stream of TTS
-            saveWaveStreamToMP3File(fileNameToCreate, worker, audioStream);    
+            //saveWaveStreamToMP3File(fileNameToCreate, worker, audioStream);    
             audioStream.Close();        // close audio stream
         }
         static private Stream textToAudioStream(string textToConvert, string voiceName, int voiceRate, BackgroundWorker worker)
         {
+            /*
             SpeechSynthesizer synth = new SpeechSynthesizer();
             synth.SpeakProgress += delegate(object sender, SpeakProgressEventArgs e)
             { synth_SpeakProgress(sender, e, worker, textToConvert.Length); };
@@ -36,7 +37,10 @@ static private Stream textToAudioStream(string textToConvert, string voiceName,
             audioStream.Position = 0;   // reset position for audio stream so it can be read
 
             return audioStream;
+            */
+            return new MemoryStream();
         }
+        /*
         static private void saveWaveStreamToMP3File(string fileNameToCreate, BackgroundWorker worker, Stream audioStream)
         {
             WaveStream waveStream = new WaveStream(audioStream);                    // read from stream
@@ -93,5 +97,6 @@ static private void synth_SpeakProgress(object sender, SpeakProgressEventArgs e,
         {
             worker.ReportProgress((Convert.ToInt16((int)(((long)e.CharacterPosition*100)/charTotal)))/2); // divide by two so only 50% will be used up
         }
+        */
     }
 }

Fast Script/Fast Script.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.props" Condition="Exists('..\packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,7 +11,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Fast_Script</RootNamespace>
     <AssemblyName>Fast Script</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -40,7 +41,6 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.DirectoryServices" />
-    <Reference Include="System.Speech" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -49,6 +49,9 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="VoiceRSS_TTS_SDK">
+      <HintPath>VoiceRSS_TTS_SDK.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="PresenterFolder\IPrinterSettings.cs" />
@@ -151,25 +154,16 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="IAudioGenerator.cs" />
+    <Compile Include="VoiceRssAudioFileMaker.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Orvis.Framework.Exception\Orvis.Framework.Exception.csproj">
       <Project>{d4252a0e-6fb2-4fbb-b261-d8788fcb3a20}</Project>
       <Name>Orvis.Framework.Exception</Name>
     </ProjectReference>
-    <ProjectReference Include="yeti.mmedia\yeti.mmedia.csproj">
-      <Project>{315EE7BF-EAE2-42C0-BFC6-CCA9160F3CFE}</Project>
-      <Name>yeti.mmedia</Name>
-    </ProjectReference>
-    <ProjectReference Include="yeti.mp3\yeti.mp3.csproj">
-      <Project>{B564FD33-FA50-46B2-B669-2D83DE3AF5E4}</Project>
-      <Name>yeti.mp3</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="lame_enc.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="XML_Bibles\King James Version.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -182,4 +176,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
+  <Import Project="..\packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.targets" Condition="Exists('..\packages\CefSharp.WinForms.57.0.0\build\CefSharp.WinForms.targets')" />
 </Project>

Fast Script/IAudioGenerator.cs

@@ -0,0 +1,10 @@
+using System;
+namespace Fast_Script
+{
+    public interface IAudioGenerator
+    {
+        void MakeFileFromText(string fileNameToCreate, string textToConvert,
+                         string voiceName, int voiceRate, 
+                         System.ComponentModel.BackgroundWorker worker);
+    }
+}

Fast Script/PresenterFolder/FileCopier.cs

@@ -7,28 +7,21 @@ namespace Fast_Script.PresenterFolder
 {
     class FileCopier
     {
-        private string _targetDir;
-        private string _fileName;
-        private string _sourceFile;
-        private string _destFile;
-
         public FileCopier(string filePath, string targetDir, string targetName)
         {
-            _sourceFile = filePath;
-            _targetDir = targetDir;
-            _fileName = System.IO.Path.GetFileName(filePath);
-            _destFile = System.IO.Path.Combine(targetDir, targetName);
+            var fileName = System.IO.Path.GetFileName(filePath);
+            var destFile = System.IO.Path.Combine(targetDir, targetName);
 
             // To copy a folder's contents to a new location:
             // Create a new target folder, if necessary.
-            if (!System.IO.Directory.Exists(_targetDir))
+            if (!System.IO.Directory.Exists(targetDir))
             {
-                System.IO.Directory.CreateDirectory(_targetDir);
+                System.IO.Directory.CreateDirectory(targetDir);
             }
 
             // To copy a file to another location and 
             // overwrite the destination file if it already exists.
-            System.IO.File.Copy(_sourceFile, _destFile, true);
+            System.IO.File.Copy(filePath, destFile, true);
         }
     }
 }

Fast Script/PresenterFolder/GUISettings.cs

@@ -5,7 +5,7 @@
 using System.Runtime.Serialization;
 using System.Drawing;
 using System.Reflection;
-using System.Speech.Synthesis;
+//using System.Speech.Synthesis;
 using System.IO;
 using Fast_Script.Properties;
 
@@ -37,6 +37,7 @@ public bible_data.Bible CurrentBible
         { get { return _currentBible; } set { _currentBible = value; } }
         // end bibles
 
+        /*
         // text to speech
         private List<InstalledVoice> _TTSvoices = null;
         public List<InstalledVoice> TTSVoices
@@ -76,6 +77,7 @@ public InstalledVoice GetTTSByName(string name)
             }
             return null;
         }
+        */
         public int TTS_Rate { get; set; }
         // end text to speech
 
@@ -96,8 +98,8 @@ public GUISettings()
 
             VerseSelecterEnabled = false;
 
-            CurrentTTSVoice = GetTTSByName( new SpeechSynthesizer().Voice.Name); // loads in default voice
-            TTS_Rate = new SpeechSynthesizer().Rate; //load default rate for TTS
+            //CurrentTTSVoice = GetTTSByName( new SpeechSynthesizer().Voice.Name); // loads in default voice
+            //TTS_Rate = new SpeechSynthesizer().Rate; //load default rate for TTS
         }
 
         private void loadDefaultBibleIfNone()
@@ -189,15 +191,15 @@ public GUISettings(SerializationInfo info, StreamingContext ctxt)
 
             PrinterFont = (Font)info.GetValue("_printFont", typeof(Font));
             VerseSelecterEnabled = (bool)info.GetValue("VerseSelecterEnabled", typeof(bool));
-            CurrentTTSVoice = GetTTSByName((string)info.GetValue("CurrentTTSVoice", typeof(string)));
+            //CurrentTTSVoice = GetTTSByName((string)info.GetValue("CurrentTTSVoice", typeof(string)));
             TTS_Rate = (int)info.GetValue("TTS_Rate", typeof(int));
         }
         public void GetObjectData(SerializationInfo info, StreamingContext ctxt)
         {
             info.AddValue("_printFont", PrinterFont);
             info.AddValue("CurrentBible", CurrentBible.BibleVersion);
             info.AddValue("VerseSelecterEnabled", VerseSelecterEnabled);
-            info.AddValue("CurrentTTSVoice", CurrentTTSVoice.VoiceInfo.Name);
+            //info.AddValue("CurrentTTSVoice", CurrentTTSVoice.VoiceInfo.Name);
             info.AddValue("TTS_Rate", TTS_Rate);
         }
     }

Fast Script/PresenterFolder/ReferenceListExtensions.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Fast_Script.PresenterFolder
 {

Fast Script/View/MainWindow.cs

@@ -35,7 +35,7 @@ public MainWindow()
 
             if (_presenter.Settings.VerseSelecterEnabled)
             { 
-                _selectVerse.resetForm(); 
+                _selectVerse.ResetForm(); 
             }
 
             //disable search bar while index is building
@@ -85,7 +85,7 @@ private void webResualts_Navigating(object sender, WebBrowserNavigatingEventArgs
             }
             else
             {
-                webResualts.Url = new Uri(_presenter.Settings.DefaultWebPage);
+                //webResults.Load(_presenter.Settings.DefaultWebPage);
             }
         }
 
@@ -96,7 +96,7 @@ public bool verseListContains(string item)
 
         public void loadWebPage(string link)
         {
-            webResualts.Url = new Uri(link);
+            //webResults.Load(link);
         }
 
         private void searchBox_Enter(object sender, EventArgs e)
@@ -127,7 +127,7 @@ public void SearchBoxSuggestions(object list, string currentText)
 
         private void SelectVersesButton_Click(object sender, EventArgs e)
         {
-            _selectVerse.resetForm();
+            _selectVerse.ResetForm();
             _presenter.Settings.VerseSelecterEnabled = true;
         }
 
@@ -434,9 +434,14 @@ private void MakeMP3backgroundWorker_DoWork(object sender, DoWorkEventArgs e)
 
             string fileName = (string) e.Argument;
             PresenterFolder.ReferenceList tempRefList = getCurrentVerseList();
+            IAudioGenerator generator = new VoiceRssAudioFileMaker();
+            generator.MakeFileFromText(fileName, _presenter.putVersesToStringForTTS(tempRefList),
+                                       string.Empty, -1, (BackgroundWorker)sender);
+            /*
             AudioFileMaker.MakeFileFromText(fileName, _presenter.putVersesToStringForTTS( tempRefList),
                 _presenter.Settings.CurrentTTSVoice.VoiceInfo.Name, _presenter.Settings.TTS_Rate, (BackgroundWorker) sender);
-        }
+			*/
+		}
 
         private void MakeMP3backgroundWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {