Merge pull request #57 from VRCWizard/VRCWizard-patch-4

Vrc wizard patch 4
VRCWizard · Oct 23, 2023 · e0e7618 · e0e7618
2 parents 63ac97f + 2963332
commit e0e7618
Show file tree

Hide file tree

Showing 16 changed files with 1,007 additions and 799 deletions.
diff --git a/OSCVRCWiz/App.config b/OSCVRCWiz/App.config
diff --git a/OSCVRCWiz/Resources/Audio/AudioDevices.cs b/OSCVRCWiz/Resources/Audio/AudioDevices.cs
@@ -283,6 +283,16 @@ public static void PlayAudioStream(Stream audioStream, TTSMessageQueue.TTSMessag
         {
             try
             {
+                //delay before audio
+                int delayBeforeAudio = Int32.Parse(VoiceWizardWindow.MainFormGlobal.textBoxDelayBeforeAudio.Text.ToString());
+                Thread.Sleep(delayBeforeAudio);
+
+                if(delayBeforeAudio != 0)
+                {
+                    OutputText.outputLog("[Playing Delayed Audio]");
+                }
+
+
                 MemoryStream memoryStream = new MemoryStream();
                 audioStream.Flush();
                 audioStream.Seek(0, SeekOrigin.Begin);

diff --git a/OSCVRCWiz/Resources/StartUp/Updater.cs b/OSCVRCWiz/Resources/StartUp/Updater.cs
@@ -7,7 +7,7 @@ namespace OSCVRCWiz.Resources.StartUp
     public class Updater
     {
 
-        public static string currentVersion = "1.5.8.1";
+        public static string currentVersion = "1.5.9";
         public static string updateXMLName = "https://github.com/VRCWizard/TTS-Voice-Wizard/releases/latest/download/AutoUpdater-x64.xml";
 
         public static async void getGithubInfo()

diff --git a/OSCVRCWiz/Services/Integrations/Heartrate/HeartratePulsoid.cs b/OSCVRCWiz/Services/Integrations/Heartrate/HeartratePulsoid.cs
@@ -217,6 +217,10 @@ private static async void doHeartrateTimerTick()
             var message3 = new CoreOSC.OscMessage("/avatar/parameters/hundredsHR", hundreds);
             OSC.OSCSender.Send(message3);
 
+            float HRPercent = (float)currentHR / 256;
+            var message4 = new CoreOSC.OscMessage("/avatar/parameters/HRPercent", (float)HRPercent);
+            OSC.OSCSender.Send(message4);
+
 
 
             //  Debug.WriteLine(currentHR + "--" + HRPrevious);
@@ -285,12 +289,12 @@ private static async void doHeartrateTimerTick()
                         }
                         if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonOSC.Checked == true)
                         {
-                            OutputText.outputVRChat("Heartrate: " + currentHR.ToString() + " bpm", "bpm");
+                            OutputText.outputVRChat("Heartrate: " + currentHR.ToString() + " bpm", OutputText.DisplayTextType.HeartRate);
 
                         }
                         if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonChatBox.Checked == true)
                         {
-                            Task.Run(() => OutputText.outputVRChatSpeechBubbles("💓 " + currentHR.ToString() + " bpm", "bpm"));
+                            Task.Run(() => OutputText.outputVRChatSpeechBubbles("💓 " + currentHR.ToString() + " bpm", OutputText.DisplayTextType.HeartRate));
 
 
                         }

diff --git a/OSCVRCWiz/Services/Integrations/Media/SpotifyAddon.cs b/OSCVRCWiz/Services/Integrations/Media/SpotifyAddon.cs
@@ -202,6 +202,7 @@ public static async Task spotifyGetCurrentSongInfo(bool playOnce)
                         theString = theString.Replace("{pause}", spotifyPausedIndicator);
                         theString = theString.Replace("{spotifyVolume}", deviceVolume);
                         theString = theString.Replace("{album}", album);
+                        theString = theString.Replace("{nline}", "\u2028");
                         theString = theString.Replace("{counter1}", VRChatListener.counter1.ToString());
                         theString = theString.Replace("{counter2}", VRChatListener.counter2.ToString());
                         theString = theString.Replace("{counter3}", VRChatListener.counter3.ToString());
@@ -225,12 +226,12 @@ public static async Task spotifyGetCurrentSongInfo(bool playOnce)
                             if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonOSC.Checked == true && VoiceWizardWindow.MainFormGlobal.rjToggleButtonSpotifyKatDisable.Checked == false)
                             {
 
-                                Task.Run(() => OutputText.outputVRChat(textTime, "spotify"));
+                                Task.Run(() => OutputText.outputVRChat(textTime, OutputText.DisplayTextType.Spotify));
                             }
                             if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonChatBox.Checked == true && VoiceWizardWindow.MainFormGlobal.rjToggleButtonSpotifyChatboxDisable.Checked == false)
                             {
                               //  theString = LineBreakerChatbox(theString, 28);//must always be the last
-                                Task.Run(() => OutputText.outputVRChatSpeechBubbles(theString, "spotify")); //original
+                                Task.Run(() => OutputText.outputVRChatSpeechBubbles(theString, OutputText.DisplayTextType.Spotify)); //original
 
                             }
                             if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonOBSText.Checked == true && VoiceWizardWindow.MainFormGlobal.rjToggleButtonMedia4OBS.Checked == true)
@@ -241,6 +242,8 @@ public static async Task spotifyGetCurrentSongInfo(bool playOnce)
 
                         // lastSong = title;
                         // MainForm.justShowTheSong = false;
+                        SpotifyAddon.lastSong = SpotifyAddon.title;
+                       // WindowsMedia.previousTitle = WindowsMedia.mediaTitle;
                         fullSongPauseCheck = progress;
 
 
@@ -348,6 +351,7 @@ public static async Task windowsMediaGetSongInfo()
                     theString = theString.Replace("{progressHours}", WindowsMedia.getMediaProgressHours());
                     theString = theString.Replace("{durationHours}", WindowsMedia.getMediaDurationHours());
                     theString = theString.Replace("{spotifySymbol}", spotifySymbol);
+                    theString = theString.Replace("{nline}", "\u2028");
                     theString = theString.Replace("{counter1}", VRChatListener.counter1.ToString());
                     theString = theString.Replace("{counter2}", VRChatListener.counter2.ToString());
                     theString = theString.Replace("{counter3}", VRChatListener.counter3.ToString());
@@ -419,6 +423,7 @@ public static async Task soundpadGetSongInfo()
                     theString = theString.Replace("{progressHours}", WindowsMedia.getMediaProgressHours());
                     theString = theString.Replace("{durationHours}", WindowsMedia.getMediaDurationHours());
                     theString = theString.Replace("{spotifySymbol}", spotifySymbol);
+                    theString = theString.Replace("{nline}", "\u2028");
                     theString = theString.Replace("{counter1}", VRChatListener.counter1.ToString());
                     theString = theString.Replace("{counter2}", VRChatListener.counter2.ToString());
                     theString = theString.Replace("{counter3}", VRChatListener.counter3.ToString());
@@ -449,18 +454,19 @@ private static void MediaOutput(string text)
             if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonOSC.Checked == true && VoiceWizardWindow.MainFormGlobal.rjToggleButtonSpotifyKatDisable.Checked == false)
             {
 
-                Task.Run(() => OutputText.outputVRChat(textTime, "spotify"));
+                Task.Run(() => OutputText.outputVRChat(textTime, OutputText.DisplayTextType.WindowsMedia));
             }
             if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonChatBox.Checked == true && VoiceWizardWindow.MainFormGlobal.rjToggleButtonSpotifyChatboxDisable.Checked == false)
             {
               //  text = LineBreakerChatbox(text, 28);//must always be the last
-                Task.Run(() => OutputText.outputVRChatSpeechBubbles(text, "media")); //original
+                Task.Run(() => OutputText.outputVRChatSpeechBubbles(text, OutputText.DisplayTextType.WindowsMedia)); //original
 
             }
             if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonOBSText.Checked == true && VoiceWizardWindow.MainFormGlobal.rjToggleButtonMedia4OBS.Checked == true)
             {
                 OutputText.outputTextFile(text, @"Output\TextOut\OBSText.txt");
             }
+            WindowsMedia.previousTitle = WindowsMedia.mediaTitle;
 
         }
 

diff --git a/OSCVRCWiz/Services/Integrations/OSCListener.cs b/OSCVRCWiz/Services/Integrations/OSCListener.cs
@@ -397,17 +397,17 @@ public static void OSCRecieveHeartRate()
                                     }
                                     if (VoiceWizardWindow.MainFormGlobal.rjToggleButton3.Checked == true && VoiceWizardWindow.MainFormGlobal.rjToggleButtonOSC.Checked == true)
                                     {
-                                        OutputText.outputVRChat("ぬ" + messageReceived.Arguments[0].ToString() + " bpm", "bpm");  //ぬ means heart emoji
+                                        OutputText.outputVRChat("ぬ" + messageReceived.Arguments[0].ToString() + " bpm", OutputText.DisplayTextType.HeartRate);  //ぬ means heart emoji
 
                                     }
                                     if (VoiceWizardWindow.MainFormGlobal.rjToggleButton3.Checked == false && VoiceWizardWindow.MainFormGlobal.rjToggleButtonOSC.Checked == true)
                                     {
-                                        OutputText.outputVRChat("Heartrate: " + messageReceived.Arguments[0].ToString() + " bpm", "bpm");  //add pack emoji toggle (add emoji selection page
+                                        OutputText.outputVRChat("Heartrate: " + messageReceived.Arguments[0].ToString() + " bpm", OutputText.DisplayTextType.HeartRate);  //add pack emoji toggle (add emoji selection page
 
                                     }
                                     if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonChatBox.Checked == true)
                                     {
-                                        Task.Run(() => OutputText.outputVRChatSpeechBubbles("Heartrate: " + messageReceived.Arguments[0].ToString() + " bpm", "bpm")); //original
+                                        Task.Run(() => OutputText.outputVRChatSpeechBubbles("Heartrate: " + messageReceived.Arguments[0].ToString() + " bpm", OutputText.DisplayTextType.HeartRate)); //original
 
 
                                     }

diff --git a/OSCVRCWiz/Services/Integrations/VRChatListener.cs b/OSCVRCWiz/Services/Integrations/VRChatListener.cs
@@ -219,11 +219,11 @@ private static void doVRCCounterTimerTick()
                     }////////////////////////////////////////////////////
                     if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonChatBox.Checked == true)
                     {
-                        Task.Run(() => OutputText.outputVRChatSpeechBubbles(theString, "bpm"));
+                        Task.Run(() => OutputText.outputVRChatSpeechBubbles(theString, OutputText.DisplayTextType.Counters));
                     }
                     if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonOSC.Checked == true)
                     {
-                        Task.Run(() => OutputText.outputVRChat(theString, "bpm"));
+                        Task.Run(() => OutputText.outputVRChat(theString, OutputText.DisplayTextType.Counters));
                     }
                 }
 
@@ -287,11 +287,11 @@ private static void doVRCCounterTimerTick()
 
                             if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonChatBox.Checked == true && OSCListener.pauseBPM != true)
                             {
-                                Task.Run(() => OutputText.outputVRChatSpeechBubbles(theString, "bpm"));
+                                Task.Run(() => OutputText.outputVRChatSpeechBubbles(theString, OutputText.DisplayTextType.Counters));
                             }
                             if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonOSC.Checked == true && OSCListener.pauseBPM != true)
                             {
-                                Task.Run(() => OutputText.outputVRChat(theString, "bpm"));
+                                Task.Run(() => OutputText.outputVRChat(theString, OutputText.DisplayTextType.Counters,i));
                             }
                         }
                     }

diff --git a/OSCVRCWiz/Services/Speech/DoSpeech.cs b/OSCVRCWiz/Services/Speech/DoSpeech.cs
@@ -385,13 +385,13 @@ public static async void MainDoTTS(TTSMessageQueue.TTSMessage TTSMessageQueued)
                     {
                         OSCListener.pauseBPM = true;
                         SpotifyAddon.pauseSpotify = true;
-                        Task.Run(() => OutputText.outputVRChat(writeText, "tts"));
+                        Task.Run(() => OutputText.outputVRChat(writeText, OutputText.DisplayTextType.TextToSpeech));
                     }
                     if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonChatBox.Checked == true && VoiceWizardWindow.MainFormGlobal.rjToggleButtonNoTTSChat.Checked == false)
                     {
                         OSCListener.pauseBPM = true;
                         SpotifyAddon.pauseSpotify = true;
-                        Task.Run(() => OutputText.outputVRChatSpeechBubbles(writeText, "tts")); //original
+                        Task.Run(() => OutputText.outputVRChatSpeechBubbles(writeText, OutputText.DisplayTextType.TextToSpeech)); //original
 
                     }
                     if (VoiceWizardWindow.MainFormGlobal.rjToggleButtonQueueSystem.Checked == true && TTSMessageQueued.TTSMode == "No TTS")