diff --git a/README.md b/README.md index 1d3c803..f9f516c 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,17 @@ VoiceMeeter integration and live feedback for the Elgato Stream Deck device. **Author's website and contact information:** [https://barraider.com](https://barraider.com) +**Modified by:** Rebel2k + +## New in v2.4 +- Added some validation checks so the `LayerNum` field is only available if the `Layer` mode is selected +- Added a step size of 3 for volume gain +- Renamed `StripLayer` mode to `Layer` +- Changed some labels in the UI + +## New in v2.3 +- Added `StripLayer` type support for the `Gain Adjust` action which allows you to control the volume of a a StripLayer from the Dials (like what you can do in the Streamer View of VoiceMeeter). + ## New in v2.2 - Added `Title` support for Microphone action diff --git a/VoiceMeeter/Actions/VMGainAdjustDialAction.cs b/VoiceMeeter/Actions/VMGainAdjustDialAction.cs index 73d2c5e..4058161 100644 --- a/VoiceMeeter/Actions/VMGainAdjustDialAction.cs +++ b/VoiceMeeter/Actions/VMGainAdjustDialAction.cs @@ -28,6 +28,7 @@ public static PluginSettings CreateDefaultSettings() { Strip = StripBusType.Strip, StripNum = 0, + LayerNum = 0, Title = String.Empty }; @@ -40,6 +41,9 @@ public static PluginSettings CreateDefaultSettings() [JsonProperty(PropertyName = "stripNum")] public int StripNum { get; set; } + [JsonProperty(PropertyName = "layerNum")] + public int LayerNum { get; set; } + [JsonProperty(PropertyName = "stepSize")] public string StepSize { get; set; } @@ -212,12 +216,27 @@ public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payloa private string BuildDeviceName() { - return $"{settings.Strip}[{settings.StripNum}].gain"; + if ( $"{settings.Strip}".Equals("2") ) + { + return $"Strip[{settings.StripNum}].GainLayer[{settings.LayerNum}]"; + } + else + { + return $"{settings.Strip}[{settings.StripNum}].gain"; + } + } private string BuildMuteName() { - return $"{settings.Strip}[{settings.StripNum}].mute"; + if ( $"{settings.Strip}".Equals("2") ) + { + return $"Strip[{settings.StripNum}].mute"; + } + else + { + return $"{settings.Strip}[{settings.StripNum}].mute"; + } } private Task SaveSettings() diff --git a/VoiceMeeter/PropertyInspector/VoiceMeeter/GainAdjustDial.html b/VoiceMeeter/PropertyInspector/VoiceMeeter/GainAdjustDial.html index 1ca8771..3b28bf7 100644 --- a/VoiceMeeter/PropertyInspector/VoiceMeeter/GainAdjustDial.html +++ b/VoiceMeeter/PropertyInspector/VoiceMeeter/GainAdjustDial.html @@ -1,4 +1,4 @@ - + @@ -10,15 +10,80 @@ +
For feedback/suggestions contact me at https://BarRaider.com
-
Strip/Bus
- +
@@ -34,6 +99,19 @@
+
+
Layer Num
+ +
Step Size
diff --git a/VoiceMeeter/manifest.json b/VoiceMeeter/manifest.json index 87326f9..e85e652 100644 --- a/VoiceMeeter/manifest.json +++ b/VoiceMeeter/manifest.json @@ -153,12 +153,12 @@ "PropertyInspectorPath": "PropertyInspector/VoiceMeeter/AdjustSettingDial.html" } ], - "Author": "BarRaider", + "Author": "BarRaider modified by Rebel2k", "Description": "VoiceMeeter integration and live feedback. Includes Dials, Hotkey and MIDI Support", "Name": "VoiceMeeter Integration", "Icon": "Images/pluginIcon", "URL": "https://BarRaider.com/", - "Version": "2.2", + "Version": "2.4", "CodePath": "com.barraider.voicemeeter.exe", "Category": "VoiceMeeter [BarRaider]", "CategoryIcon": "Images/categoryIcon",