Param
diff --git a/VoiceMeeter/SettingsBase.cs b/VoiceMeeter/SettingsBase.cs
deleted file mode 100644
index 2847aeb..0000000
--- a/VoiceMeeter/SettingsBase.cs
+++ /dev/null
@@ -1,54 +0,0 @@
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VoiceMeeter
-{
- public abstract class SettingsBase
- {
- #region Public Implementations
-
- public async void SendToPropertyInspectorAsync()
- {
- if (StreamDeckConnection != null && !String.IsNullOrEmpty(ContextId) && !String.IsNullOrEmpty(ActionId))
- {
- await StreamDeckConnection.SendToPropertyInspectorAsync(ActionId, JObject.FromObject(this), this.ContextId);
- }
- }
-
- public async void SetSettingsAsync()
- {
- if (StreamDeckConnection != null && !String.IsNullOrEmpty(ContextId) && !String.IsNullOrEmpty(ActionId))
- {
- await StreamDeckConnection.SetSettingsAsync(JObject.FromObject(this), this.ContextId);
- }
- }
-
- public async void SetImageAsync(string base64Image)
- {
- await StreamDeckConnection.SetImageAsync(base64Image, this.ContextId, streamdeck_client_csharp.SDKTarget.HardwareAndSoftware);
- }
-
- public async void SetTitleAsync(string title)
- {
- await StreamDeckConnection.SetTitleAsync(title, this.ContextId, streamdeck_client_csharp.SDKTarget.HardwareAndSoftware);
- }
-
- #endregion
-
-
- [JsonIgnore]
- public string ActionId { private get; set; }
-
- [JsonIgnore]
- public string ContextId { private get; set; }
-
- [JsonIgnore]
- public streamdeck_client_csharp.StreamDeckConnection StreamDeckConnection { private get; set; }
-
- }
-}
diff --git a/VoiceMeeter/StreamDeckOptions.cs b/VoiceMeeter/StreamDeckOptions.cs
deleted file mode 100644
index 461fa5c..0000000
--- a/VoiceMeeter/StreamDeckOptions.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using CommandLine;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VoiceMeeter
-{
- public class StreamDeckOptions
- {
- [Option("port", Required = true, HelpText = "The websocket port to connect to", SetName = "port")]
- public int Port { get; set; }
-
- [Option("pluginUUID", Required = true, HelpText = "The UUID of the plugin")]
- public string PluginUUID { get; set; }
-
- [Option("registerEvent", Required = true, HelpText = "The event triggered when the plugin is registered?")]
- public string RegisterEvent { get; set; }
-
- [Option("info", Required = true, HelpText = "Extra JSON launch data")]
- public string Info { get; set; }
- }
-}
diff --git a/VoiceMeeter/Tools.cs b/VoiceMeeter/Tools.cs
deleted file mode 100644
index 5f21116..0000000
--- a/VoiceMeeter/Tools.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VoiceMeeter
-{
- public class Tools
- {
- private Tools() {}
-
- private const string HEADER_PREFIX = "data:image/png;base64,";
-
- public static string FileToBase64(string fileName, bool addHeaderPrefix)
- {
- if (!File.Exists(fileName))
- {
- return null;
- }
-
- using (Image image = Image.FromFile(fileName))
- {
- using (MemoryStream m = new MemoryStream())
- {
- image.Save(m, image.RawFormat);
- byte[] imageBytes = m.ToArray();
-
- // Convert byte[] to Base64 String
- string base64String = Convert.ToBase64String(imageBytes);
- return addHeaderPrefix ? HEADER_PREFIX + base64String : base64String;
- }
- }
- }
- }
-}
diff --git a/VoiceMeeter/VMAdvanced.cs b/VoiceMeeter/VMAdvanced.cs
index 6491712..a19184a 100644
--- a/VoiceMeeter/VMAdvanced.cs
+++ b/VoiceMeeter/VMAdvanced.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using BarRaider.SdTools;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -88,6 +89,12 @@ public void KeyPressed()
keyPressed = true;
keyPressStart = DateTime.Now;
+ if (!VMManager.Instance.IsConnected)
+ {
+ settings.ShowAlert();
+ return;
+ }
+
if (!String.IsNullOrEmpty(settings.SetValue))
{
VMManager.Instance.SetParameters(settings.SetValue);
diff --git a/VoiceMeeter/VMAdvancedToggle.cs b/VoiceMeeter/VMAdvancedToggle.cs
index 02f90db..3552b28 100644
--- a/VoiceMeeter/VMAdvancedToggle.cs
+++ b/VoiceMeeter/VMAdvancedToggle.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using BarRaider.SdTools;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -84,6 +85,12 @@ public VMAdvancedToggle(streamdeck_client_csharp.StreamDeckConnection connection
public void KeyPressed()
{
+ if (!VMManager.Instance.IsConnected)
+ {
+ settings.ShowAlert();
+ return;
+ }
+
bool isMode1 = IsMode1();
if (isMode1 && !String.IsNullOrEmpty(settings.Mode2Value))
{
diff --git a/VoiceMeeter/VMMicrophone.cs b/VoiceMeeter/VMMicrophone.cs
index 06c5715..d8657f0 100644
--- a/VoiceMeeter/VMMicrophone.cs
+++ b/VoiceMeeter/VMMicrophone.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using BarRaider.SdTools;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -90,6 +91,12 @@ public VMMicrophone(streamdeck_client_csharp.StreamDeckConnection connection, st
public void KeyPressed()
{
+ if (!VMManager.Instance.IsConnected)
+ {
+ settings.ShowAlert();
+ return;
+ }
+
switch (settings.MicType)
{
case MicTypeEnum.SingleMode:
diff --git a/VoiceMeeter/VMModify.cs b/VoiceMeeter/VMModify.cs
index 21dcb69..5c439af 100644
--- a/VoiceMeeter/VMModify.cs
+++ b/VoiceMeeter/VMModify.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using BarRaider.SdTools;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -113,6 +114,12 @@ public void LongKeyPressed()
public void KeyPressed()
{
+ if (!VMManager.Instance.IsConnected)
+ {
+ settings.ShowAlert();
+ return;
+ }
+
// Used for long press
keyPressed = true;
keyPressStart = DateTime.Now;
diff --git a/VoiceMeeter/VoiceMeeter.csproj b/VoiceMeeter/VoiceMeeter.csproj
index c41e521..2d4b7f8 100644
--- a/VoiceMeeter/VoiceMeeter.csproj
+++ b/VoiceMeeter/VoiceMeeter.csproj
@@ -33,6 +33,10 @@
4
+
+ False
+ ..\..\barraider-sdtools\barraider-sdtools\bin\Release\barraider-sdtools.dll
+
..\packages\CommandLineParser.2.4.3\lib\netstandard2.0\CommandLine.dll
@@ -59,7 +63,6 @@
-
True
True
@@ -68,9 +71,6 @@
-
-
-
diff --git a/VoiceMeeter/manifest.json b/VoiceMeeter/manifest.json
index b854934..8a504b3 100644
--- a/VoiceMeeter/manifest.json
+++ b/VoiceMeeter/manifest.json
@@ -11,7 +11,7 @@
}
],
"SupportedInMultiActions": true,
- "Tooltip": "VoiceMeeter Mute/Unmute - See a live indication of the current status on Stream Deck (never forget your microphone on again!)",
+ "Tooltip": "VoiceMeeter Mute/Unmute - See a live indication of the current status on Stream Deck (never forget your microphone on again!).",
"UUID": "com.barraider.vmmicrophone",
"PropertyInspectorPath": "PropertyInspector/VoiceMeeter/Microphone.html"
},
@@ -26,7 +26,7 @@
}
],
"SupportedInMultiActions": true,
- "Tooltip": "VoiceMeeter Modify Setting - Allows you to easily modify various VoiceMeeter settings",
+ "Tooltip": "VoiceMeeter Modify Setting - Allows you to easily modify various VoiceMeeter settings.",
"UUID": "com.barraider.vmmodify",
"PropertyInspectorPath": "PropertyInspector/VoiceMeeter/Modify.html"
},
@@ -41,7 +41,7 @@
}
],
"SupportedInMultiActions": true,
- "Tooltip": "VoiceMeeter Advanced Click/Long-Click - Directly access any setting through text. Supports both Click and Long Click (allows you to change between two preset list of settings)",
+ "Tooltip": "VoiceMeeter Advanced Click/Long-Click - Directly access any setting through text. Supports both Click and Long Click (allows you to change between two preset list of settings).",
"UUID": "com.barraider.vmadvanced",
"PropertyInspectorPath": "PropertyInspector/VoiceMeeter/Advanced.html"
},
@@ -56,17 +56,17 @@
}
],
"SupportedInMultiActions": true,
- "Tooltip": "VoiceMeeter Advanced Toggle - Focused on toggling between two modes (versus click and long click in the VoiceMeeter Advanced Click/Long-Click)",
+ "Tooltip": "VoiceMeeter Advanced Toggle - Focused on toggling between two modes (versus click and long click in the VoiceMeeter Advanced Click/Long-Click).",
"UUID": "com.barraider.vmadvancedtoggle",
"PropertyInspectorPath": "PropertyInspector/VoiceMeeter/AdvancedToggle.html"
}
],
"Author": "BarRaider",
- "Description": "VoiceMeeter integration and live feedback. Four different plugins all supporting a variity of customizied features. Control VoiceMeeter and get live feedback all on your Stream Deck.",
+ "Description": "VoiceMeeter integration and live feedback. Four different plugins all supporting a variety of customized features. Control VoiceMeeter and get live feedback all on your Stream Deck.",
"Name": "VoiceMeeter Integration",
"Icon": "Images/pluginIcon",
"URL": "https://barraider.github.io/",
- "Version": "1.0",
+ "Version": "1.01",
"CodePath": "com.barraider.voicemeeter.sdPlugin.exe",
"Category": "BarRaider",
"CategoryIcon": "Images/categoryIcon",