Merge pull request #70 from BarRaider/advanced_logic

v2.2 - Title support for Microphone action - Added `Title` support for Microphone action - Added support for new Stream Deck SDK
BarRaider · Apr 29, 2023 · 9114236 · 9114236
2 parents 524ee8e + 86c8d70
commit 9114236
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -3,6 +3,9 @@ VoiceMeeter integration and live feedback for the Elgato Stream Deck device.
 
 **Author's website and contact information:** [https://barraider.com](https://barraider.com)
 
+## New in v2.2
+- Added `Title` support for Microphone action
+
 ## New in v2.1
 - **Advanced Queries Support** - The `Advanced Toggle` action's `Mode1 Check` now supports performing complex queries with `==` and `!=` as well as `AND/OR`. 
     - Example: `Strip[0].Mute AND Strip[1].Gain==7.5 AND Strip[2].device.name!="Elgato Wave"`

diff --git a/VoiceMeeter/Actions/VMGainAdjustDialAction.cs b/VoiceMeeter/Actions/VMGainAdjustDialAction.cs
@@ -112,24 +112,30 @@ public async override void DialRotate(DialRotatePayload payload)
             VMManager.Instance.SetParam(BuildDeviceName(), (float)outputVolume);
         }
 
-        public async override void DialPress(DialPressPayload payload)
+
+        public async override void DialDown(DialPayload payload)
         {
-            Logger.Instance.LogMessage(TracingLevel.INFO, $"{this.GetType()} Dial Pressed");
+            Logger.Instance.LogMessage(TracingLevel.INFO, $"{this.GetType()} Dial Down");
             if (!VMManager.Instance.IsConnected)
             {
-                Logger.Instance.LogMessage(TracingLevel.ERROR, $"Dial Pressed but VM is not connected!");
+                Logger.Instance.LogMessage(TracingLevel.ERROR, $"Dial Down but VM is not connected!");
                 await Connection.ShowAlert();
                 return;
             }
 
-            if (payload.IsDialPressed)
+            dialWasRotated = false;
+        }
+
+        public async override void DialUp(DialPayload payload)
+        {
+            Logger.Instance.LogMessage(TracingLevel.INFO, $"{this.GetType()} Dial Up");
+            if (!VMManager.Instance.IsConnected)
             {
-                Logger.Instance.LogMessage(TracingLevel.INFO, $"{this.GetType()} Dial Pressed");
-                dialWasRotated = false;
+                Logger.Instance.LogMessage(TracingLevel.ERROR, $"Dial Up but VM is not connected!");
+                await Connection.ShowAlert();
                 return;
             }
 
-            Logger.Instance.LogMessage(TracingLevel.INFO, $"{this.GetType()} Dial Released");
             if (dialWasRotated)
             {
                 return;

diff --git a/VoiceMeeter/Actions/VMMicrophoneAction.cs b/VoiceMeeter/Actions/VMMicrophoneAction.cs
@@ -40,7 +40,8 @@ public static PluginSettings CreateDefaultSettings()
                     UserImage1 = String.Empty,
                     UserImage2 = String.Empty,
                     MuteHotkey = String.Empty,
-                    UnmuteHotkey = String.Empty
+                    UnmuteHotkey = String.Empty,
+                    TitlePrefix = String.Empty
                 };
 
                 return instance;
@@ -75,12 +76,16 @@ public static PluginSettings CreateDefaultSettings()
             [JsonProperty(PropertyName = "unmuteHotkey")]
             public string UnmuteHotkey { get; set; }
 
+            [JsonProperty(PropertyName = "titlePrefix")]
+            public string TitlePrefix { get; set; }
+
         }
 
         #region Private members
 
         private readonly PluginSettings settings;
         private bool didSetNotConnected = false;
+        private bool didSetTitle = false;
 
         #endregion
 
@@ -177,6 +182,20 @@ public async override void OnTick()
                 await Connection.SetImageAsync((String)null);
             }
 
+            // Set the title
+            string titlePrefix = settings.TitlePrefix?.Replace(@"\n", "\n");
+            bool isTitleEmpty = String.IsNullOrEmpty(titlePrefix);
+            if (!isTitleEmpty || didSetTitle)
+            {
+                didSetTitle = true;
+                await Connection.SetTitleAsync(titlePrefix);
+
+                if (isTitleEmpty)
+                {
+                    didSetTitle = false;
+                }
+            }
+
             await Connection.SetImageAsync(GetBase64ImageStatus());
         }
 

diff --git a/VoiceMeeter/Actions/VMSettingAdjustDialAction.cs b/VoiceMeeter/Actions/VMSettingAdjustDialAction.cs
@@ -123,23 +123,29 @@ public async override void DialRotate(DialRotatePayload payload)
             VMManager.Instance.SetParam(BuildDeviceName(), (float)outputValue);
         }
 
-        public async override void DialPress(DialPressPayload payload)
+        public async override void DialDown(DialPayload payload)
         {
+            Logger.Instance.LogMessage(TracingLevel.INFO, $"{this.GetType()} Dial Down");
             if (!VMManager.Instance.IsConnected)
             {
-                Logger.Instance.LogMessage(TracingLevel.ERROR, $"Dial Pressed but VM is not connected!");
+                Logger.Instance.LogMessage(TracingLevel.ERROR, $"Dial Down but VM is not connected!");
                 await Connection.ShowAlert();
                 return;
             }
 
-            if (payload.IsDialPressed)
+            dialWasRotated = false;
+        }
+
+        public async override void DialUp(DialPayload payload)
+        {
+            Logger.Instance.LogMessage(TracingLevel.INFO, $"{this.GetType()} Dial Up");
+            if (!VMManager.Instance.IsConnected)
             {
-                Logger.Instance.LogMessage(TracingLevel.INFO, $"{this.GetType()} Dial Pressed");
-                dialWasRotated = false;
+                Logger.Instance.LogMessage(TracingLevel.ERROR, $"Dial Up but VM is not connected!");
+                await Connection.ShowAlert();
                 return;
             }
 
-            Logger.Instance.LogMessage(TracingLevel.INFO, $"{this.GetType()} Dial Released");
             if (dialWasRotated)
             {
                 return;

diff --git a/VoiceMeeter/PropertyInspector/VoiceMeeter/Microphone.html b/VoiceMeeter/PropertyInspector/VoiceMeeter/Microphone.html
@@ -45,6 +45,10 @@
                 <option value="7">7</option>
             </select>
         </div>
+        <div class="sdpi-item">
+            <div class="sdpi-item-label">Title</div>
+            <input class="sdpi-item-value sdProperty" placeholder="Text on key" value="" id="titlePrefix" oninput="setSettings()">
+        </div>
         <div class="sdpi-item" id="select_single">
             <div class="sdpi-item-label">Icon</div>
             <select class="sdpi-item-value select sdProperty" id="imageType" oninput="setSettings()">

diff --git a/VoiceMeeter/VoiceMeeter.csproj b/VoiceMeeter/VoiceMeeter.csproj
@@ -38,7 +38,7 @@
 	<ItemGroup>
 		<PackageReference Include="RtMidi.Core" Version="1.0.51" />
 		<PackageReference Include="Serilog" Version="2.12.0" />
-		<PackageReference Include="StreamDeck-Tools" Version="5.9.1-Beta1" />
+		<PackageReference Include="StreamDeck-Tools" Version="6.1.1" />
 	</ItemGroup>
 	<ItemGroup>
 		<Reference Include="CommandLine, Version=2.8.0.0, Culture=neutral, PublicKeyToken=5a870481e358d379, processorArchitecture=MSIL">

diff --git a/VoiceMeeter/manifest.json b/VoiceMeeter/manifest.json
@@ -158,7 +158,7 @@
   "Name": "VoiceMeeter Integration",
   "Icon": "Images/pluginIcon",
   "URL": "https://BarRaider.com/",
-  "Version": "2.1",
+  "Version": "2.2",
   "CodePath": "com.barraider.voicemeeter.exe",
   "Category": "VoiceMeeter [BarRaider]",
   "CategoryIcon": "Images/categoryIcon",