Merge 7159baf into b84dccb

kylergib · Aug 11, 2024 · ab5124f · ab5124f
2 parents b84dccb + 7159baf
commit ab5124f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ def mainClassPackage = 'com.kylergib.wavelinktp'
 group mainClassPackage
 def versionMajor = 2
 def versionMinor = 0
-def versionPatch = 1
+def versionPatch = 2
 version versionMajor + '.' + versionMinor + '.' + versionPatch
 def versionCode = versionMajor * 1000 + versionMinor * 100 + versionPatch
 

diff --git a/src/main/java/com/kylergib/wavelinktp/WaveLinkPlugin.java b/src/main/java/com/kylergib/wavelinktp/WaveLinkPlugin.java
@@ -1293,8 +1293,8 @@ public boolean checkForUpdate() {
     public void sendDynamicStates(Input input) {
         //todo: left off, next to to update the send update states and add output level states
         LOGGER.log(Level.FINER, "Trying to send states for input: " + input.getName());
-        waveLinkPlugin.sendCreateState("WaveLinkMuteStates",input.getLocalMuteStateId().replace(" ", ""),"Wave Link Mute States",input.getLocalMuteStateId(), input.getLocalMixerMuted());
-        waveLinkPlugin.sendCreateState("WaveLinkMuteStates",input.getStreamMuteStateId().replace(" ", ""),"Wave Link Mute States",input.getStreamMuteStateId(), input.getStreamMixerMuted());
+        waveLinkPlugin.sendCreateState("WaveLinkMuteStates",input.getLocalMuteStateId().replace(" ", ""),"Wave Link Mute States",input.getLocalMuteStateId(), input.getLocalMixerMuted() ? "muted" : "unmuted");
+        waveLinkPlugin.sendCreateState("WaveLinkMuteStates",input.getStreamMuteStateId().replace(" ", ""),"Wave Link Mute States",input.getStreamMuteStateId(), input.getStreamMixerMuted() ? "muted" : "unmuted");
 
 
         waveLinkPlugin.sendCreateState("WaveLinkFilterStates",input.getLocalFilterBypassStateId().replace(" ", ""),"Wave Link Filter States",input.getLocalFilterBypassStateId(), input.getPluginBypassLocal());
@@ -1327,6 +1327,8 @@ public void sendDynamicStates(Input input) {
 
 
         input.setStatesSentToTP(true);
+        waveLinkPlugin.setInputValue(input.getLocalMixerLevel(),"Local", input, true);
+        waveLinkPlugin.setInputValue(input.getStreamMixerLevel(),"Stream", input, true);
         LOGGER.log(Level.FINER, "Sent states for input: " + input.getName());
 
 

diff --git a/src/main/java/com/kylergib/wavelinktp/model/ApiHandler.java b/src/main/java/com/kylergib/wavelinktp/model/ApiHandler.java
@@ -41,8 +41,9 @@ private void processQueue() {
                 } else if (update instanceof ConnectorUpdateInfo) {
                     callback.onConnectorUpdate((ConnectorUpdateInfo) update);
 
-                    Thread.sleep(1000 / rate); // Delay between requests
+
                 }
+                Thread.sleep(1000 / rate); // Delay between requests
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 break;

diff --git a/src/main/java/com/kylergib/wavelinktp/model/Status.java b/src/main/java/com/kylergib/wavelinktp/model/Status.java
@@ -112,6 +112,7 @@ public static void getOutputConfig() {
                 }
                 WaveLinkPlugin.waveLinkPlugin.sendStateUpdate(WaveLinkPluginConstants.WaveLinkOutputs.States.StreamMixOut.ID,sendMute);
                 WaveLinkPlugin.setOutputValue(streamMixerLevel, "Stream", true);
+
             }
 
         }
@@ -248,6 +249,7 @@ public static void getInput() {
                 allInputs.add(newInput);
                 WaveLinkPlugin.waveLinkPlugin.sendDynamicStates(newInput);
             }
+
         }
 //        WaveLinkPlugin.waveLinkPlugin.sendChoiceUpdate(WaveLinkPluginConstants
 //                .WaveLinkInputs.States.InputList.ID, allInputsString);