Moved common files to external library. New icon when VoiceMeeter is …

…disconnected
BarRaider · Jan 17, 2019 · 54c795f · 54c795f
1 parent 5c10b03
commit 54c795f
Show file tree

Hide file tree

Showing 24 changed files with 396 additions and 264 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ VoiceMeeter Advanced Plugin is now called *VoiceMeeter Advanced Click/Long-Click
 - See a live indication of the current status on Stream Deck (never forget your microphone on again!)
 - Can also be used to mute/unmute different Strips/Buses such as Spotify/Background music/etc.
 - Choose from 4 different icons to display the mute/unmute settings
-- **New in v0.6:** You can now choose your own images to display, instead of the 4 pre-defined icons
+- **New in v1.0:** You can now choose your own images to display, instead of the 4 pre-defined icons
 
 #### VoiceMeeter Modify Setting
 - Allows you to easily modify various VoiceMeeter settings

diff --git a/VoiceMeeter/App.config b/VoiceMeeter/App.config
diff --git a/VoiceMeeter/IPluginable.cs b/VoiceMeeter/IPluginable.cs
diff --git a/VoiceMeeter/PluginContainer.cs b/VoiceMeeter/PluginContainer.cs
@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using BarRaider.SdTools;
+using Newtonsoft.Json;
 using streamdeck_client_csharp;
 using streamdeck_client_csharp.Events;
 using System;
@@ -99,7 +100,7 @@ private async void RunTick()
                     }
                     else
                     {
-                        _ = connection.SetImageAsync(Properties.Plugin.Default.VMDefault, kvp.Key, SDKTarget.HardwareAndSoftware);
+                        _ = connection.SetImageAsync(Properties.Plugin.Default.VMNotRunning, kvp.Key, SDKTarget.HardwareAndSoftware);
                     }
                 }
             }

diff --git a/VoiceMeeter/Program.cs b/VoiceMeeter/Program.cs
@@ -1,4 +1,5 @@
-using CommandLine;
+using BarRaider.SdTools;
+using CommandLine;
 using System;
 
 namespace VoiceMeeter

diff --git a/VoiceMeeter/Properties/Plugin.settings b/VoiceMeeter/Properties/Plugin.settings
diff --git a/VoiceMeeter/Properties/Plugin1.Designer.cs b/VoiceMeeter/Properties/Plugin1.Designer.cs
diff --git a/VoiceMeeter/PropertyInspector/Advanced.js b/VoiceMeeter/PropertyInspector/Advanced.js
@@ -92,6 +92,18 @@ function sendValueToPlugin(value, param) {
     }
 }
 
+function openWebsite() {
+    if (websocket && (websocket.readyState === 1)) {
+        const json = {
+            'event': 'openUrl',
+            'payload': {
+                'url': 'https://BarRaider.github.io'
+            }
+        };
+        websocket.send(JSON.stringify(json));
+    }
+}
+
 if (!isQT) {
     document.addEventListener('DOMContentLoaded', function () {
         initPropertyInspector();

diff --git a/VoiceMeeter/PropertyInspector/AdvancedToggle.js b/VoiceMeeter/PropertyInspector/AdvancedToggle.js
@@ -133,6 +133,18 @@ function sendValueToPlugin(value, param) {
     }
 }
 
+function openWebsite() {
+    if (websocket && (websocket.readyState === 1)) {
+        const json = {
+            'event': 'openUrl',
+            'payload': {
+                'url': 'https://BarRaider.github.io'
+            }
+        };
+        websocket.send(JSON.stringify(json));
+    }
+}
+
 if (!isQT) {
     document.addEventListener('DOMContentLoaded', function () {
         initPropertyInspector();

diff --git a/VoiceMeeter/PropertyInspector/Microphone.js b/VoiceMeeter/PropertyInspector/Microphone.js
@@ -131,6 +131,18 @@ function sendValueToPlugin(value, param) {
     }
 }
 
+function openWebsite() {
+    if (websocket && (websocket.readyState === 1)) {
+        const json = {
+            'event': 'openUrl',
+            'payload': {
+                'url': 'https://BarRaider.github.io'
+            }
+        };
+        websocket.send(JSON.stringify(json));
+    }
+}
+
 if (!isQT) {
     document.addEventListener('DOMContentLoaded', function () {
         initPropertyInspector();

diff --git a/VoiceMeeter/PropertyInspector/Modify.js b/VoiceMeeter/PropertyInspector/Modify.js
@@ -104,6 +104,18 @@ function sendValueToPlugin(value, param) {
     }
 }
 
+function openWebsite() {
+    if (websocket && (websocket.readyState === 1)) {
+        const json = {
+            'event': 'openUrl',
+            'payload': {
+                'url': 'https://BarRaider.github.io'
+            }
+        };
+        websocket.send(JSON.stringify(json));
+    }
+}
+
 if (!isQT) {
     document.addEventListener('DOMContentLoaded', function () {
         initPropertyInspector();

diff --git a/VoiceMeeter/PropertyInspector/VoiceMeeter/Advanced.html b/VoiceMeeter/PropertyInspector/VoiceMeeter/Advanced.html
@@ -16,7 +16,7 @@
                 Example: "Strip[0].mono=1;Bus[2].Gain=-20;"
             </p>
             <p>
-                For more information or feedback/suggestions contact me at <a href="https://BarRaider.github.io" target="_blank">https://BarRaider.github.io</a>
+                For more information or feedback/suggestions contact me at <a href="https://BarRaider.github.io" target="_blank" onclick="openWebsite()">https://BarRaider.github.io</a>
             </p>
         </details>
         <div class="sdpi-item">

diff --git a/VoiceMeeter/PropertyInspector/VoiceMeeter/AdvancedToggle.html b/VoiceMeeter/PropertyInspector/VoiceMeeter/AdvancedToggle.html
@@ -16,7 +16,7 @@
                 Example: "Strip[0].mono=1;Bus[2].Gain=-20;"
             </p>
             <p>
-                For more information or feedback/suggestions contact me at <a href="https://BarRaider.github.io" target="_blank">https://BarRaider.github.io</a>
+                For more information or feedback/suggestions contact me at <a href="https://BarRaider.github.io" target="_blank" onclick="openWebsite()">https://BarRaider.github.io</a>
             </p>
         </details>
         <div class="sdpi-item">

diff --git a/VoiceMeeter/PropertyInspector/VoiceMeeter/Microphone.html b/VoiceMeeter/PropertyInspector/VoiceMeeter/Microphone.html
@@ -11,7 +11,7 @@
 <body>
     <div class="sdpi-wrapper">
         <details class="message info">
-            <summary>For feedback/suggestions contact me at <a href="https://BarRaider.github.io" target="_blank">https://BarRaider.github.io</a> </summary>
+            <summary>For feedback/suggestions contact me at <a href="https://BarRaider.github.io" target="_blank" onclick="openWebsite()">https://BarRaider.github.io</a> </summary>
         </details>
         <div class="sdpi-item" id="select_single">
             <div class="sdpi-item-label">Mic Type</div>

diff --git a/VoiceMeeter/PropertyInspector/VoiceMeeter/Modify.html b/VoiceMeeter/PropertyInspector/VoiceMeeter/Modify.html
@@ -11,7 +11,7 @@
 <body>
     <div class="sdpi-wrapper">
         <details class="message info">
-            <summary>For feedback/suggestions contact me at <a href="https://BarRaider.github.io" target="_blank">https://BarRaider.github.io</a> </summary>
+            <summary>For feedback/suggestions contact me at <a href="https://BarRaider.github.io" target="_blank" onclick="openWebsite()">https://BarRaider.github.io</a> </summary>
         </details>
         <div class="sdpi-item" id="select_single">
             <div class="sdpi-item-label">Param</div>

diff --git a/VoiceMeeter/SettingsBase.cs b/VoiceMeeter/SettingsBase.cs
diff --git a/VoiceMeeter/StreamDeckOptions.cs b/VoiceMeeter/StreamDeckOptions.cs
diff --git a/VoiceMeeter/Tools.cs b/VoiceMeeter/Tools.cs
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -33,6 +33,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="barraider-sdtools, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\barraider-sdtools\barraider-sdtools\bin\Release\barraider-sdtools.dll</HintPath>
+    </Reference>
     <Reference Include="CommandLine, Version=2.4.3.0, Culture=neutral, PublicKeyToken=de6f01bd326f8c32, processorArchitecture=MSIL">
       <HintPath>..\packages\CommandLineParser.2.4.3\lib\netstandard2.0\CommandLine.dll</HintPath>
     </Reference>
@@ -59,7 +63,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IPluginable.cs" />
     <Compile Include="Properties\Plugin1.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
@@ -68,9 +71,6 @@
     <Compile Include="PluginContainer.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SettingsBase.cs" />
-    <Compile Include="StreamDeckOptions.cs" />
-    <Compile Include="Tools.cs" />
     <Compile Include="VMAdvanced.cs" />
     <Compile Include="VMAdvancedToggle.cs" />
     <Compile Include="VMManager.cs" />