Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vrc wizard patch 4 #57

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Vrc wizard patch 4 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d819e9
KAT refactor and improvments
VRCWizard Oct 13, 2023
2963332
v1.5.9
VRCWizard Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified OSCVRCWiz/App.config
View file
Open in desktop
Binary file not shown.
10 changes: 10 additions & 0 deletions OSCVRCWiz/Resources/Audio/AudioDevices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion OSCVRCWiz/Resources/StartUp/Updater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 6 additions & 2 deletions OSCVRCWiz/Services/Integrations/Heartrate/HeartratePulsoid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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));


}
Expand Down
14 changes: 10 additions & 4 deletions OSCVRCWiz/Services/Integrations/Media/SpotifyAddon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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)
Expand All @@ -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;


Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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;

}

Expand Down
6 changes: 3 additions & 3 deletions OSCVRCWiz/Services/Integrations/OSCListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


}
Expand Down
8 changes: 4 additions & 4 deletions OSCVRCWiz/Services/Integrations/VRChatListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down Expand Up @@ -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));
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions OSCVRCWiz/Services/Speech/DoSpeech.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading