From 522e86325d9d41418b73516c760da97d8a484b41 Mon Sep 17 00:00:00 2001 From: BarRaider Date: Fri, 8 Mar 2019 13:51:48 -0800 Subject: [PATCH] Moved to StreamDeck-Tools v2.0.1 to support MultiActions --- VoiceMeeter/Program.cs | 1 + VoiceMeeter/VMAdvancedPTT.cs | 5 ++++- VoiceMeeter/VMAdvancedPress.cs | 5 ++++- VoiceMeeter/VMAdvancedToggle.cs | 5 ++++- VoiceMeeter/VMMicrophone.cs | 5 ++++- VoiceMeeter/VMModify.cs | 5 ++++- VoiceMeeter/VoiceMeeter.csproj | 4 ++-- VoiceMeeter/manifest.json | 2 +- VoiceMeeter/packages.config | 2 +- 9 files changed, 25 insertions(+), 9 deletions(-) diff --git a/VoiceMeeter/Program.cs b/VoiceMeeter/Program.cs index f1dec45..b1ab71f 100644 --- a/VoiceMeeter/Program.cs +++ b/VoiceMeeter/Program.cs @@ -11,6 +11,7 @@ static void Main(string[] args) { // Uncomment this line of code to allow for debugging //while (!System.Diagnostics.Debugger.IsAttached) { System.Threading.Thread.Sleep(100); } + SDWrapper.Run(args); } } diff --git a/VoiceMeeter/VMAdvancedPTT.cs b/VoiceMeeter/VMAdvancedPTT.cs index b765c0c..7109b9c 100644 --- a/VoiceMeeter/VMAdvancedPTT.cs +++ b/VoiceMeeter/VMAdvancedPTT.cs @@ -114,7 +114,10 @@ public override void ReceivedSettings(ReceivedSettingsPayload payload) public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload) { } - public override void Dispose() { } + public override void Dispose() + { + Logger.Instance.LogMessage(TracingLevel.INFO, "Destructor called"); + } #endregion } diff --git a/VoiceMeeter/VMAdvancedPress.cs b/VoiceMeeter/VMAdvancedPress.cs index f6a6746..54bb8e5 100644 --- a/VoiceMeeter/VMAdvancedPress.cs +++ b/VoiceMeeter/VMAdvancedPress.cs @@ -136,7 +136,10 @@ public async override void OnTick() } } - public override void Dispose() { } + public override void Dispose() + { + Logger.Instance.LogMessage(TracingLevel.INFO, "Destructor called"); + } public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload) { } diff --git a/VoiceMeeter/VMAdvancedToggle.cs b/VoiceMeeter/VMAdvancedToggle.cs index 7798f35..6870364 100644 --- a/VoiceMeeter/VMAdvancedToggle.cs +++ b/VoiceMeeter/VMAdvancedToggle.cs @@ -134,7 +134,10 @@ public async override void OnTick() } } - public override void Dispose() { } + public override void Dispose() + { + Logger.Instance.LogMessage(TracingLevel.INFO, "Destructor called"); + } public async override void ReceivedSettings(ReceivedSettingsPayload payload) { diff --git a/VoiceMeeter/VMMicrophone.cs b/VoiceMeeter/VMMicrophone.cs index 158bad3..29763ad 100644 --- a/VoiceMeeter/VMMicrophone.cs +++ b/VoiceMeeter/VMMicrophone.cs @@ -139,7 +139,10 @@ public async override void OnTick() await Connection.SetImageAsync(GetBase64ImageStatus()); } - public override void Dispose() { } + public override void Dispose() + { + Logger.Instance.LogMessage(TracingLevel.INFO, "Destructor called"); + } public async override void ReceivedSettings(ReceivedSettingsPayload payload) { diff --git a/VoiceMeeter/VMModify.cs b/VoiceMeeter/VMModify.cs index e890e1b..37b240d 100644 --- a/VoiceMeeter/VMModify.cs +++ b/VoiceMeeter/VMModify.cs @@ -159,7 +159,10 @@ public async override void OnTick() } } - public override void Dispose() { } + public override void Dispose() + { + Logger.Instance.LogMessage(TracingLevel.INFO, "Destructor called"); + } public override void ReceivedSettings(ReceivedSettingsPayload payload) { diff --git a/VoiceMeeter/VoiceMeeter.csproj b/VoiceMeeter/VoiceMeeter.csproj index 35058c3..4c7da3a 100644 --- a/VoiceMeeter/VoiceMeeter.csproj +++ b/VoiceMeeter/VoiceMeeter.csproj @@ -45,8 +45,8 @@ ..\..\..\DotNet\StreamDeck\packages\streamdeck-client-csharp.4.1.0\lib\netstandard2.0\streamdeck-client-csharp.dll - - ..\..\..\DotNet\StreamDeck\packages\StreamDeck-Tools.2.0.0\lib\net472\StreamDeckTools.dll + + ..\..\..\DotNet\StreamDeck\packages\StreamDeck-Tools.2.0.1\lib\net472\StreamDeckTools.dll diff --git a/VoiceMeeter/manifest.json b/VoiceMeeter/manifest.json index ac71494..9a31868 100644 --- a/VoiceMeeter/manifest.json +++ b/VoiceMeeter/manifest.json @@ -81,7 +81,7 @@ "Name": "VoiceMeeter Integration", "Icon": "Images/pluginIcon", "URL": "https://barraider.github.io/", - "Version": "1.2", + "Version": "1.3", "CodePath": "com.barraider.voicemeeter.exe", "Category": "BarRaider", "CategoryIcon": "Images/categoryIcon", diff --git a/VoiceMeeter/packages.config b/VoiceMeeter/packages.config index c9fb599..0d76028 100644 --- a/VoiceMeeter/packages.config +++ b/VoiceMeeter/packages.config @@ -5,6 +5,6 @@ - + \ No newline at end of file