From ba0607df8cc7440ff388c0e7464d388ffebee436 Mon Sep 17 00:00:00 2001
From: Terry M <zv1n.fire@gmail.com>
Date: Mon, 15 May 2023 12:23:28 -0500
Subject: [PATCH 01/10] Initial pass at updating volume to radial knobs.

---
 .../actions/toggle-mute/plugin.js             | 25 -------
 .../inspector.html                            | 11 ++-
 .../actions/volume-stepper/plugin.js          | 74 +++++++++++++++++++
 co.meldstudio.streamdeck.sdPlugin/app.html    |  2 +-
 .../assets/audioMute.svg                      |  5 ++
 co.meldstudio.streamdeck.sdPlugin/de.json     | 10 +++
 co.meldstudio.streamdeck.sdPlugin/en.json     | 11 +++
 .../libs/js/inspector.js                      | 26 +++++++
 .../libs/js/meldstudio.js                     |  4 +
 .../manifest.json                             | 29 ++++++--
 10 files changed, 160 insertions(+), 37 deletions(-)
 delete mode 100644 co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/plugin.js
 rename co.meldstudio.streamdeck.sdPlugin/actions/{toggle-mute => volume-stepper}/inspector.html (67%)
 create mode 100644 co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
 create mode 100644 co.meldstudio.streamdeck.sdPlugin/assets/audioMute.svg
diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/plugin.js b/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/plugin.js
deleted file mode 100644
index 69477c7..0000000
--- a/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/plugin.js
+++ /dev/null
@@ -1,25 +0,0 @@
-class ToggleMute extends MeldStudioPlugin {
-  constructor() {
-    super("co.meldstudio.streamdeck.toggle-mute");
-
-    this.action.onKeyUp(({ action, context, device, event, payload }) => {
-      const { track } = this.getSettings(context);
-      if (!track) return;
-
-      if ($MS.meld?.toggleMute) $MS.meld.toggleMute(track);
-    });
-
-    $MS.on("sessionChanged", (session) => {
-      this.forAllContexts((context, settings) => {
-        const { track } = settings;
-        if (!track) return;
-        if (!session.items[track]) return $SD.setState(context, 1);
-
-        const state = session.items[track].muted ? 0 : 1;
-        $SD.setState(context, state);
-      });
-    });
-  }
-}
-
-const toggleMate = new ToggleMute();
diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/inspector.html b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/inspector.html
similarity index 67%
rename from co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/inspector.html
rename to co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/inspector.html
index 962f4b0..0e5d504 100644
--- a/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/inspector.html
+++ b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/inspector.html
@@ -3,16 +3,20 @@
 
 <head>
     <meta charset="utf-8" />
-    <title>co.meldstudio.streamdeck.toggle-mute Property Inspector</title>
+    <title>co.meldstudio.streamdeck.volume-stepper Property Inspector</title>
     <link rel="stylesheet" href="../../libs/css/sdpi.css">
 </head>
 
 <body>
-    <div class="sdpi-toggle-mute sdpi-wrapper">
+    <div class="sdpi-volume-stepper sdpi-wrapper">
         <div class="sdpi-item">
             <div class="sdpi-item-label" data-localize="Track">Track</div>
             <select class="sdpi-item-value select" id="track"></select>
         </div>
+        <div class="sdpi-item">
+            <div class="sdpi-item-label" data-localize="StepSize">Step Size</div>
+            <input type="number" class="sdpi-item-value" id="stepsize" value="3"/>
+        </div>
     
       <div class="sdpi-item" id="loading" style="display: none;">
         <div class="sdpi-connecting" data-localize="Connecting">Connecting to Meld Studio...</div>
@@ -33,7 +37,8 @@
     <script>
       $PI.on('connected', () => {
           $MSPI.watchConnections('loading');
-          $MSPI.initializeSelection("co.meldstudio.streamdeck.toggle-mute", ["track"]);
+          $MSPI.initializeSelection("co.meldstudio.streamdeck.volume-stepper", ["track"])
+          $MSPI.initializeText("co.meldstudio.streamdeck.volume-stepper", ["stepsize"]);
       });
     </script>
 </body>
diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
new file mode 100644
index 0000000..05ec820
--- /dev/null
+++ b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
@@ -0,0 +1,74 @@
+class ToggleMute extends MeldStudioPlugin {
+  constructor() {
+    super("co.meldstudio.streamdeck.volume-stepper");
+
+    this.action.onKeyUp(({ action, context, device, event, payload }) => {
+      const { track } = this.getSettings(context);
+      if (!track) return;
+
+      if ($MS.meld?.toggleMute) $MS.meld.toggleMute(track);
+    });
+
+    this.action.onDialRotate(({ action, context, device, event, payload }) => {
+      const { track, stepsize: stepString } = this.getSettings(context);
+      const stepsize = parseFloat(stepString);
+
+      if (!track) return;
+
+      const newdB = +stepsize * payload.ticks;
+
+      if ($MS.meld?.setVolume) $MS.meld.setVolume(track, newdB);
+    });
+
+    this.action.onDialPress(({ action, context, device, event, payload }) => {
+      if (!payload.pressed) return;
+
+      const { track } = this.getSettings(context);
+      if (!track) return;
+
+      if ($MS.meld?.toggleMute) $MS.meld.toggleMute(track);
+    });
+
+    this.action.onTouchTap(({ action, context, device, event, payload }) => {
+      if (payload.hold) return;
+
+      const { tapPos } = payload;
+      const { track } = this.getSettings(context);
+      if (!track) return;
+
+      // Indicator starts at x=76 and is 108 pixels wide.
+      if (tapPos[0] > 80) {
+        if (tapPos[0] > 180) return;
+
+        const ratio = (tapPos[0] - 80) / 100;
+        const dB = (1 - ratio) * -60;
+
+        if ($MS.meld?.setVolume) $MS.meld.setVolume(track, dB);
+      } else {
+        if ($MS.meld?.toggleMute) $MS.meld.toggleMute(track);
+      }
+    });
+
+    $MS.on("sessionChanged", (session) => {
+      this.forAllContexts((context, settings) => {
+        const { track } = settings;
+        if (!track) return;
+        if (!session.items[track]) return $SD.setState(context, 1);
+
+        const state = session.items[track].muted ? 0 : 1;
+        $SD.setState(context, state);
+      });
+    });
+
+    $MS.on("gainChanged", (trackId, gain) => {
+      this.forAllContexts((context, settings) => {
+        const { track } = settings;
+        if (!track || trackId != track) return;
+
+        $SD.setState(context, { gain });
+      });
+    });
+  }
+}
+
+const toggleMate = new ToggleMute();
diff --git a/co.meldstudio.streamdeck.sdPlugin/app.html b/co.meldstudio.streamdeck.sdPlugin/app.html
index 308114b..e0867df 100644
--- a/co.meldstudio.streamdeck.sdPlugin/app.html
+++ b/co.meldstudio.streamdeck.sdPlugin/app.html
@@ -30,7 +30,7 @@
     <script src="actions/show-scene/plugin.js"></script>
     <script src="actions/toggle-layer/plugin.js"></script>
     <script src="actions/toggle-effect/plugin.js"></script>
-    <script src="actions/toggle-mute/plugin.js"></script>
+    <script src="actions/volume-stepper/plugin.js"></script>
     <script src="actions/toggle-stream/plugin.js"></script>
     <script src="actions/toggle-record/plugin.js"></script>
 
diff --git a/co.meldstudio.streamdeck.sdPlugin/assets/audioMute.svg b/co.meldstudio.streamdeck.sdPlugin/assets/audioMute.svg
new file mode 100644
index 0000000..5506b30
--- /dev/null
+++ b/co.meldstudio.streamdeck.sdPlugin/assets/audioMute.svg
@@ -0,0 +1,5 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.125 25.625L29.375 16.875" stroke="#EFEFEF" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.375 25.625L38.125 16.875" stroke="#EFEFEF" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23.125 1.875L11.25 11.875H4.375C2.9943 11.875 1.875 12.9943 1.875 14.375V25.625C1.875 27.0057 2.9943 28.125 4.375 28.125H11.25L23.125 38.125V1.875Z" stroke="#EFEFEF" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/co.meldstudio.streamdeck.sdPlugin/de.json b/co.meldstudio.streamdeck.sdPlugin/de.json
index 21da1d7..ea76a94 100644
--- a/co.meldstudio.streamdeck.sdPlugin/de.json
+++ b/co.meldstudio.streamdeck.sdPlugin/de.json
@@ -26,6 +26,16 @@
         "Name": "Go Live",
         "Tooltip": "Starten oder stoppen Sie einen Livestream."
     },
+    "co.meldstudio.streamdeck.volume-stepper": {
+        "Name": "Adjust Volume",
+        "Tooltip": "Adjust the volume of a specified audio track.",
+        "Encoder": {
+            "TriggerDescription": {
+                "Rotate": "Adjust Volume",
+                "Touch": "Adjust Volume"
+            }
+        }
+    },
     "Localization": {
         "Scene": "Szene",
         "Layer": "Layer",
diff --git a/co.meldstudio.streamdeck.sdPlugin/en.json b/co.meldstudio.streamdeck.sdPlugin/en.json
index e2bc48b..90f0138 100644
--- a/co.meldstudio.streamdeck.sdPlugin/en.json
+++ b/co.meldstudio.streamdeck.sdPlugin/en.json
@@ -26,11 +26,22 @@
         "Name": "Go Live",
         "Tooltip": "Start or stop a live stream."
     },
+    "co.meldstudio.streamdeck.volume-stepper": {
+        "Name": "Adjust Volume",
+        "Tooltip": "Adjust the volume of a specified audio track.",
+        "Encoder": {
+            "TriggerDescription": {
+                "Rotate": "Adjust Volume",
+                "Touch": "Mute Track"
+            }
+        }
+    },
     "Localization": {
         "Scene": "Scene",
         "Layer": "Layer",
         "Track": "Track",
         "Effect": "Effect",
+        "StepSize": "Step Size",
         "Connecting": "Connecting to Meld Studio..."
     }
 }
\ No newline at end of file
diff --git a/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js b/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js
index 92d6833..033bef5 100644
--- a/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js
+++ b/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js
@@ -106,6 +106,32 @@ class MeldStudioPropertyInspector {
 		$PI.getSettings();
 	}
 
+	initializeText(action, elements) {
+		for (let id of elements) {
+			const el = document.getElementById(id);
+			console.assert(el.id, 'Select element not found');
+			if (!el) continue;
+
+			this.settings[el] = '';
+
+			el.onchange = () => {
+				if (!this.settings) return;
+				this.settings = { ...this.settings, [id]: el.value };
+				$PI.setSettings(this.settings);
+			};
+		}
+
+		$PI.onDidReceiveSettings(action, ({ action, payload }) => {
+			const { settings } = payload;
+			this.settings = settings;
+
+			for (let field of elements) {
+				const dom_field = document.getElementById(field);
+				dom_field.value = settings[field];
+			}
+		});
+	}
+
 	watchConnections(id) {
 		$MS.on('connected', () => {
 			document.getElementById(id).style = 'display: none;';
diff --git a/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js b/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js
index abd4623..93a2f83 100644
--- a/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js
+++ b/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js
@@ -42,6 +42,10 @@ class MeldStudio {
 					this.emit('isRecordingChanged', this.meld.isRecording);
 				});
 
+				this.meld.gainUpdated.connect((id, gain) => {
+					this.emit('gainChanged', id, gain);
+				});
+
 				this.ready = true;
 				this.emit('ready');
 				this.emit('sessionChanged', this.meld.session);
diff --git a/co.meldstudio.streamdeck.sdPlugin/manifest.json b/co.meldstudio.streamdeck.sdPlugin/manifest.json
index e6dcee0..8a2b520 100644
--- a/co.meldstudio.streamdeck.sdPlugin/manifest.json
+++ b/co.meldstudio.streamdeck.sdPlugin/manifest.json
@@ -36,20 +36,33 @@
       "PropertyInspectorPath": "actions/show-scene/inspector.html"
     },
     {
-      "Icon": "assets/iconAudioTrack",
-      "Name": "Mute Track",
+      "Icon": "assets/audioMute",
+      "Name": "Adjust Volume",
       "States": [
         {
-          "Image": "assets/mutedTrack"
+          "Image": "assets/mutedTrack",
+          "TitleColor": "#FFFFFF"
         },
         {
-          "Image": "assets/unmutedTrack"
+          "Image": "assets/unmutedTrack",
+          "TitleColor": "#FFFFFF"
         }
       ],
-      "SupportedInMultiActions": true,
-      "Tooltip": "Mute an audio track!",
-      "UUID": "co.meldstudio.streamdeck.toggle-mute",
-      "PropertyInspectorPath": "actions/toggle-mute/inspector.html"
+      "Controllers": [
+        "Keypad",
+        "Encoder"
+      ],
+      "Encoder": {
+        "layout": "$B1",
+        "TriggerDescription": {
+          "Rotate": "Adjust Volume",
+          "Touch": "Mute Track",
+          "Push": "Mute Track"
+        }
+      },
+      "Tooltip": "Adjust the volume of a specified audio track.",
+      "UUID": "co.meldstudio.streamdeck.volume-stepper",
+      "PropertyInspectorPath": "actions/volume-stepper/inspector.html"
     },
     {
       "Icon": "assets/iconLayerVisibility",

From 2b7b3a79b472acee81c87213f3e66b272d663d2d Mon Sep 17 00:00:00 2001
From: Terry M <zv1n.fire@gmail.com>
Date: Tue, 30 May 2023 02:49:39 -0500
Subject: [PATCH 02/10] Working volume stepper.

---
 .../actions/volume-stepper/plugin.js          | 92 +++++++++++++++----
 .../libs/js/meldstudio.js                     | 27 +++++-
 .../manifest.json                             |  2 +-
 3 files changed, 100 insertions(+), 21 deletions(-)

diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
index 05ec820..d706390 100644
--- a/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
+++ b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
@@ -1,4 +1,6 @@
-class ToggleMute extends MeldStudioPlugin {
+class VolumeStepper extends MeldStudioPlugin {
+  trackInfo = {};
+
   constructor() {
     super("co.meldstudio.streamdeck.volume-stepper");
 
@@ -9,15 +11,21 @@ class ToggleMute extends MeldStudioPlugin {
       if ($MS.meld?.toggleMute) $MS.meld.toggleMute(track);
     });
 
-    this.action.onDialRotate(({ action, context, device, event, payload }) => {
+    this.action.onDialRotate(({ context, payload }) => {
       const { track, stepsize: stepString } = this.getSettings(context);
-      const stepsize = parseFloat(stepString);
+      const stepsize = 0.01 * parseFloat(stepString);
+      const info = this.trackInfo[track];
 
       if (!track) return;
 
-      const newdB = +stepsize * payload.ticks;
+      let gain = +stepsize * payload.ticks + info.gain;
+      gain = gain < 0 ? 0 : gain;
+      gain = gain > 1 ? 1 : gain;
+
+      // Store the new gain until the callback fires.
+      this.trackInfo[track] = { ...info, gain };
 
-      if ($MS.meld?.setVolume) $MS.meld.setVolume(track, newdB);
+      if ($MS.meld?.setGain) $MS.meld?.setGain(track, gain);
     });
 
     this.action.onDialPress(({ action, context, device, event, payload }) => {
@@ -40,35 +48,87 @@ class ToggleMute extends MeldStudioPlugin {
       if (tapPos[0] > 80) {
         if (tapPos[0] > 180) return;
 
-        const ratio = (tapPos[0] - 80) / 100;
-        const dB = (1 - ratio) * -60;
+        const info = this.trackInfo[track];
+        const gain = (tapPos[0] - 80) / 100;
+
+        // Store the new gain until the callback fires.
+        this.trackInfo[track] = { ...info, gain };
 
-        if ($MS.meld?.setVolume) $MS.meld.setVolume(track, dB);
+        if ($MS.meld?.setGain) $MS.meld?.setGain(track, gain);
       } else {
         if ($MS.meld?.toggleMute) $MS.meld.toggleMute(track);
       }
     });
 
+    this.action.onDidReceiveSettings(({ context, payload }) => {
+      this.setSettings(context, payload?.settings ?? {});
+
+      if ($MS.ready) {
+        this.onReady(context, payload?.settings);
+      }
+
+      // If we lose connection, we may need to reinitialize.
+      $MS.on("ready", () => {
+        this.onReady(context, payload?.settings);
+      });
+    });
+
     $MS.on("sessionChanged", (session) => {
-      this.forAllContexts((context, settings) => {
-        const { track } = settings;
+      this.forAllContexts((context, { track }) => {
         if (!track) return;
         if (!session.items[track]) return $SD.setState(context, 1);
 
-        const state = session.items[track].muted ? 0 : 1;
+        const { name, muted } = session.items[track];
+        const state = muted ? 0 : 1;
+
+        this.trackInfo[track] = { ...this.trackInfo[track], name, muted };
+
         $SD.setState(context, state);
       });
     });
 
-    $MS.on("gainChanged", (trackId, gain) => {
-      this.forAllContexts((context, settings) => {
-        const { track } = settings;
+    $MS.on("gainChanged", (trackId, gain, muted) => {
+      this.forAllContexts((context, { track }) => {
         if (!track || trackId != track) return;
 
-        $SD.setState(context, { gain });
+        let info = this.trackInfo[track];
+        info = { ...info, gain, muted };
+
+        this.setGainAndMute(context, info);
+        this.trackInfo[track] = info;
       });
     });
   }
+
+  setGainAndMute(context, { gain, muted, name }) {
+    $SD.setFeedback(context, {
+      title: name ?? "Adjust Volume",
+      icon: muted ? "assets/audioMute.svg" : "assets/iconAudioTrack.svg",
+      value: `${parseInt(gain * 100)}%`,
+      indicator: { value: gain * 100, enabled: true },
+    });
+  }
+
+  connectGain(context, track) {
+    this.trackInfo[track] = { gain: 0.0, muted: false, name: "Adjust Volume" };
+    $MS.meld.registerTrackObserver(context, track);
+
+    $MS.meld.gainUpdated.connect((track, gain, muted) => {
+      const info = this.trackInfo[track];
+      this.trackInfo[track] = { ...info, gain, muted };
+
+      this.setGainAndMute(context, this.trackInfo[track]);
+    });
+
+    this.action.onWillDisappear(() => {
+      $MS.meld.unregisterTrackObserver(context, track);
+    });
+  }
+
+  onReady(context, { track }) {
+    console.assert($MS.ready);
+    if (this.isEncoder(context)) this.connectGain(context, track);
+  }
 }
 
-const toggleMate = new ToggleMute();
+const volumeStepper = new VolumeStepper();
diff --git a/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js b/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js
index 93a2f83..293e93a 100644
--- a/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js
+++ b/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js
@@ -42,8 +42,8 @@ class MeldStudio {
 					this.emit('isRecordingChanged', this.meld.isRecording);
 				});
 
-				this.meld.gainUpdated.connect((id, gain) => {
-					this.emit('gainChanged', id, gain);
+				this.meld.gainUpdated.connect((id, gain, mute) => {
+					this.emit('gainChanged', id, gain, mute);
 				});
 
 				this.ready = true;
@@ -77,20 +77,39 @@ class MeldStudioPlugin {
 	constructor(UUID) {
 		this.action = new Action(UUID);
 
-		this.action.onWillAppear(({ context }) => {
-			this.contexts[context] = { settings: {} };
+		this.action.onWillAppear(({ context, payload }) => {
+			this.contexts[context] = {
+				isEncoder: payload.controller == 'Encoder',
+				settings: {},
+			};
 			$SD.getSettings(context);
 		});
 
 		this.action.onDidReceiveSettings(({ context, payload }) => {
+			const oldSettings = this.getSettings(context);
 			this.setSettings(context, payload?.settings ?? {});
+
+			if ($MS.ready) {
+				this.onReady(context, payload?.settings, oldSettings);
+			}
+
+			// If we lose connection, we may need to reinitialize.
+			$MS.on('ready', () => {
+				this.onReady(context, payload?.settings, oldSettings);
+			});
 		});
 	}
 
+	onReady() {}
+
 	setSettings(context, settings) {
 		this.contexts[context].settings = settings;
 	}
 
+	isEncoder(context) {
+		return this.contexts[context].isEncoder;
+	}
+
 	getSettings(context) {
 		return this.contexts[context].settings;
 	}
diff --git a/co.meldstudio.streamdeck.sdPlugin/manifest.json b/co.meldstudio.streamdeck.sdPlugin/manifest.json
index 8a2b520..c1ee1e3 100644
--- a/co.meldstudio.streamdeck.sdPlugin/manifest.json
+++ b/co.meldstudio.streamdeck.sdPlugin/manifest.json
@@ -36,7 +36,7 @@
       "PropertyInspectorPath": "actions/show-scene/inspector.html"
     },
     {
-      "Icon": "assets/audioMute",
+      "Icon": "assets/iconAudioTrack",
       "Name": "Adjust Volume",
       "States": [
         {

From c20860d7748bc7c2709178c9c2c0002343dbee74 Mon Sep 17 00:00:00 2001
From: Terry M <zv1n.fire@gmail.com>
Date: Tue, 30 May 2023 12:28:26 -0500
Subject: [PATCH 03/10] Adding toggle-mute control back in.

---
 .../actions/toggle-mute/inspector.html        | 41 +++++++++++++++++++
 .../actions/toggle-mute/plugin.js             | 25 +++++++++++
 co.meldstudio.streamdeck.sdPlugin/en.json     |  2 +-
 .../manifest.json                             | 21 +++++++---
 4 files changed, 83 insertions(+), 6 deletions(-)
 create mode 100644 co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/inspector.html
 create mode 100644 co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/plugin.js

diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/inspector.html b/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/inspector.html
new file mode 100644
index 0000000..962f4b0
--- /dev/null
+++ b/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/inspector.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8" />
+    <title>co.meldstudio.streamdeck.toggle-mute Property Inspector</title>
+    <link rel="stylesheet" href="../../libs/css/sdpi.css">
+</head>
+
+<body>
+    <div class="sdpi-toggle-mute sdpi-wrapper">
+        <div class="sdpi-item">
+            <div class="sdpi-item-label" data-localize="Track">Track</div>
+            <select class="sdpi-item-value select" id="track"></select>
+        </div>
+    
+      <div class="sdpi-item" id="loading" style="display: none;">
+        <div class="sdpi-connecting" data-localize="Connecting">Connecting to Meld Studio...</div>
+      </div>
+    </div>
+
+    <!-- libs -->
+    <script src="../../libs/js/utils.js"></script>
+    <script src="../../libs/js/constants.js"></script>
+    <script src="../../libs/js/events.js"></script>
+    <script src="../../libs/js/api.js"></script>
+    <script src="../../libs/js/property-inspector.js"></script>
+    <script src="../../libs/js/timers.js"></script>
+    <script src="../../libs/js/qwebchannel.js"></script>
+    <script src="../../libs/js/meldstudio.js"></script>
+    <script src="../../libs/js/inspector.js"></script>
+
+    <script>
+      $PI.on('connected', () => {
+          $MSPI.watchConnections('loading');
+          $MSPI.initializeSelection("co.meldstudio.streamdeck.toggle-mute", ["track"]);
+      });
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/plugin.js b/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/plugin.js
new file mode 100644
index 0000000..69477c7
--- /dev/null
+++ b/co.meldstudio.streamdeck.sdPlugin/actions/toggle-mute/plugin.js
@@ -0,0 +1,25 @@
+class ToggleMute extends MeldStudioPlugin {
+  constructor() {
+    super("co.meldstudio.streamdeck.toggle-mute");
+
+    this.action.onKeyUp(({ action, context, device, event, payload }) => {
+      const { track } = this.getSettings(context);
+      if (!track) return;
+
+      if ($MS.meld?.toggleMute) $MS.meld.toggleMute(track);
+    });
+
+    $MS.on("sessionChanged", (session) => {
+      this.forAllContexts((context, settings) => {
+        const { track } = settings;
+        if (!track) return;
+        if (!session.items[track]) return $SD.setState(context, 1);
+
+        const state = session.items[track].muted ? 0 : 1;
+        $SD.setState(context, state);
+      });
+    });
+  }
+}
+
+const toggleMate = new ToggleMute();
diff --git a/co.meldstudio.streamdeck.sdPlugin/en.json b/co.meldstudio.streamdeck.sdPlugin/en.json
index 90f0138..2302be0 100644
--- a/co.meldstudio.streamdeck.sdPlugin/en.json
+++ b/co.meldstudio.streamdeck.sdPlugin/en.json
@@ -32,7 +32,7 @@
         "Encoder": {
             "TriggerDescription": {
                 "Rotate": "Adjust Volume",
-                "Touch": "Mute Track"
+                "Touch": "Adjust Volume"
             }
         }
     },
diff --git a/co.meldstudio.streamdeck.sdPlugin/manifest.json b/co.meldstudio.streamdeck.sdPlugin/manifest.json
index c1ee1e3..1ef820e 100644
--- a/co.meldstudio.streamdeck.sdPlugin/manifest.json
+++ b/co.meldstudio.streamdeck.sdPlugin/manifest.json
@@ -37,26 +37,37 @@
     },
     {
       "Icon": "assets/iconAudioTrack",
-      "Name": "Adjust Volume",
+      "Name": "Mute Track",
       "States": [
         {
-          "Image": "assets/mutedTrack",
-          "TitleColor": "#FFFFFF"
+          "Image": "assets/mutedTrack"
         },
+        {
+          "Image": "assets/unmutedTrack"
+        }
+      ],
+      "SupportedInMultiActions": true,
+      "Tooltip": "Mute an audio track!",
+      "UUID": "co.meldstudio.streamdeck.toggle-mute",
+      "PropertyInspectorPath": "actions/toggle-mute/inspector.html"
+    },
+    {
+      "Icon": "assets/iconAudioTrack",
+      "Name": "Adjust Volume",
+      "States": [
         {
           "Image": "assets/unmutedTrack",
           "TitleColor": "#FFFFFF"
         }
       ],
       "Controllers": [
-        "Keypad",
         "Encoder"
       ],
       "Encoder": {
         "layout": "$B1",
         "TriggerDescription": {
           "Rotate": "Adjust Volume",
-          "Touch": "Mute Track",
+          "Touch": "Adjust Volume/Mute Track",
           "Push": "Mute Track"
         }
       },

From 7c6353466c06eaac25b3826b595ee2548c1030aa Mon Sep 17 00:00:00 2001
From: Terry M <zv1n.fire@gmail.com>
Date: Tue, 30 May 2023 14:43:15 -0500
Subject: [PATCH 04/10] Update icons.

---
 co.meldstudio.streamdeck.sdPlugin/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/co.meldstudio.streamdeck.sdPlugin/manifest.json b/co.meldstudio.streamdeck.sdPlugin/manifest.json
index 1ef820e..2a108a1 100644
--- a/co.meldstudio.streamdeck.sdPlugin/manifest.json
+++ b/co.meldstudio.streamdeck.sdPlugin/manifest.json
@@ -56,7 +56,7 @@
       "Name": "Adjust Volume",
       "States": [
         {
-          "Image": "assets/unmutedTrack",
+          "Image": "assets/unmutedTrack-gif-preview",
           "TitleColor": "#FFFFFF"
         }
       ],
@@ -67,7 +67,7 @@
         "layout": "$B1",
         "TriggerDescription": {
           "Rotate": "Adjust Volume",
-          "Touch": "Adjust Volume/Mute Track",
+          "Touch": "Adjust Volume",
           "Push": "Mute Track"
         }
       },

From ac27e60f893e6545304cd8ccd5cf5dca57fc5bfe Mon Sep 17 00:00:00 2001
From: Terry M <zv1n.fire@gmail.com>
Date: Wed, 31 May 2023 19:10:42 -0500
Subject: [PATCH 05/10] Finalize volume control.

---
 .../actions/volume-stepper/plugin.js          |  93 +++++++++++++-----
 .../assets/audioMute.svg                      |   6 +-
 .../assets/audioUnmuted40.svg                 |   4 +
 .../assets/audioUnmuted40@2x.svg              |   4 +
 .../assets/iconSpeaker.png                    | Bin 0 -> 1352 bytes
 .../libs/js/inspector.js                      |   7 +-
 .../libs/js/meldstudio.js                     |   4 +-
 .../manifest.json                             |   6 +-
 8 files changed, 92 insertions(+), 32 deletions(-)
 create mode 100644 co.meldstudio.streamdeck.sdPlugin/assets/audioUnmuted40.svg
 create mode 100644 co.meldstudio.streamdeck.sdPlugin/assets/audioUnmuted40@2x.svg
 create mode 100644 co.meldstudio.streamdeck.sdPlugin/assets/iconSpeaker.png

diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
index d706390..4cfea98 100644
--- a/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
+++ b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
@@ -1,5 +1,6 @@
 class VolumeStepper extends MeldStudioPlugin {
   trackInfo = {};
+  unregisterCallbacks = {};
 
   constructor() {
     super("co.meldstudio.streamdeck.volume-stepper");
@@ -18,7 +19,7 @@ class VolumeStepper extends MeldStudioPlugin {
 
       if (!track) return;
 
-      let gain = +stepsize * payload.ticks + info.gain;
+      let gain = +stepsize * payload.ticks + (info?.gain ?? 0.0);
       gain = gain < 0 ? 0 : gain;
       gain = gain > 1 ? 1 : gain;
 
@@ -65,12 +66,17 @@ class VolumeStepper extends MeldStudioPlugin {
 
       if ($MS.ready) {
         this.onReady(context, payload?.settings);
+      } else {
+        // If we lose connection, we may need to reinitialize.
+        $MS.on("ready", () => {
+          this.onReady(context, payload?.settings);
+        });
+
+        this.setGainAndMute(context, {
+          gain: 0.0,
+          muted: true,
+        });
       }
-
-      // If we lose connection, we may need to reinitialize.
-      $MS.on("ready", () => {
-        this.onReady(context, payload?.settings);
-      });
     });
 
     $MS.on("sessionChanged", (session) => {
@@ -87,41 +93,82 @@ class VolumeStepper extends MeldStudioPlugin {
       });
     });
 
-    $MS.on("gainChanged", (trackId, gain, muted) => {
+    $MS.on("gainChanged", ({ trackId, gain, muted }) => {
+      let info = this.trackInfo[trackId];
+      info = { ...info, gain, muted };
+      this.trackInfo[trackId] = info;
+
       this.forAllContexts((context, { track }) => {
         if (!track || trackId != track) return;
-
-        let info = this.trackInfo[track];
-        info = { ...info, gain, muted };
-
         this.setGainAndMute(context, info);
-        this.trackInfo[track] = info;
       });
     });
   }
 
   setGainAndMute(context, { gain, muted, name }) {
+    // meter colors -
+    //   green:   #6DDE92
+    //   orange:  #FB923C
+    //   red:     #F04A4A
+
+    const info = (() => {
+      if (!muted) {
+        if (gain > 0.4) return { icon: "assets/iconAudioTrack" };
+        if (gain > 0.0) return { icon: "assets/audioUnmuted40" };
+      }
+      return { icon: "assets/audioMute" };
+    })();
+
     $SD.setFeedback(context, {
+      ...info,
       title: name ?? "Adjust Volume",
-      icon: muted ? "assets/audioMute.svg" : "assets/iconAudioTrack.svg",
       value: `${parseInt(gain * 100)}%`,
-      indicator: { value: gain * 100, enabled: true },
+      indicator: {
+        value: gain * 100,
+        enabled: true,
+        bar_bg_c: muted ? "0:#666666,1:#666666" : "0:#6DDE92,1:#6DDE92",
+      },
     });
   }
 
-  connectGain(context, track) {
-    this.trackInfo[track] = { gain: 0.0, muted: false, name: "Adjust Volume" };
+  register(context, track) {
+    console.assert($MS.meld);
+
+    const callbackInfo = this.unregisterCallbacks[context];
+    // Only register once.
+    if (callbackInfo?.track === track) return;
+
+    this.maybeUnregister(context, track);
     $MS.meld.registerTrackObserver(context, track);
 
-    $MS.meld.gainUpdated.connect((track, gain, muted) => {
-      const info = this.trackInfo[track];
-      this.trackInfo[track] = { ...info, gain, muted };
+    this.unregisterCallbacks[context] = {
+      callback: () => {
+        if ($MS.meld) $MS.meld.unregisterTrackObserver(context, track);
+      },
+      track,
+    };
+  }
 
-      this.setGainAndMute(context, this.trackInfo[track]);
-    });
+  maybeUnregister(context) {
+    const callbackInfo = this.unregisterCallbacks[context];
+    if (!callbackInfo) return;
+
+    callbackInfo.callback();
+    this.unregisterCallbacks[context] = undefined;
+  }
+
+  connectGain(context, track) {
+    this.trackInfo[track] = {
+      gain: 0.0,
+      muted: false,
+      name: $MS.meld ? $MS.meld.session.items[track]?.name  : "Adjust Volume"
+    };
+
+    this.setGainAndMute(context, this.trackInfo[track]);
+    this.register(context, track);
 
-    this.action.onWillDisappear(() => {
-      $MS.meld.unregisterTrackObserver(context, track);
+    this.action.onWillDisappear(({ context }) => {
+      this.maybeUnregister(context);
     });
   }
 
diff --git a/co.meldstudio.streamdeck.sdPlugin/assets/audioMute.svg b/co.meldstudio.streamdeck.sdPlugin/assets/audioMute.svg
index 5506b30..6f960bc 100644
--- a/co.meldstudio.streamdeck.sdPlugin/assets/audioMute.svg
+++ b/co.meldstudio.streamdeck.sdPlugin/assets/audioMute.svg
@@ -1,5 +1,5 @@
 <svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M38.125 25.625L29.375 16.875" stroke="#EFEFEF" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M29.375 25.625L38.125 16.875" stroke="#EFEFEF" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M23.125 1.875L11.25 11.875H4.375C2.9943 11.875 1.875 12.9943 1.875 14.375V25.625C1.875 27.0057 2.9943 28.125 4.375 28.125H11.25L23.125 38.125V1.875Z" stroke="#EFEFEF" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M38.125 25.625L29.375 16.875" stroke="#666666" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M29.375 25.625L38.125 16.875" stroke="#666666" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23.125 1.875L11.25 11.875H4.375C2.9943 11.875 1.875 12.9943 1.875 14.375V25.625C1.875 27.0057 2.9943 28.125 4.375 28.125H11.25L23.125 38.125V1.875Z" stroke="#666666" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/co.meldstudio.streamdeck.sdPlugin/assets/audioUnmuted40.svg b/co.meldstudio.streamdeck.sdPlugin/assets/audioUnmuted40.svg
new file mode 100644
index 0000000..af9f33c
--- /dev/null
+++ b/co.meldstudio.streamdeck.sdPlugin/assets/audioUnmuted40.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M14.6875 8.43762C14.6875 8.43762 15.3125 9.04287 15.3125 10C15.3125 10.9571 14.6875 11.5626 14.6875 11.5626" stroke="#EFEFEF" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M11.5625 0.9375L5.625 5.9375H2.1875C1.49715 5.9375 0.9375 6.49715 0.9375 7.1875V12.8125C0.9375 13.5029 1.49715 14.0625 2.1875 14.0625H5.625L11.5625 19.0625V0.9375Z" stroke="#EFEFEF" stroke-width="1.66667" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/co.meldstudio.streamdeck.sdPlugin/assets/audioUnmuted40@2x.svg b/co.meldstudio.streamdeck.sdPlugin/assets/audioUnmuted40@2x.svg
new file mode 100644
index 0000000..604aa27
--- /dev/null
+++ b/co.meldstudio.streamdeck.sdPlugin/assets/audioUnmuted40@2x.svg
@@ -0,0 +1,4 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M29.375 16.8753C29.375 16.8753 30.625 18.0858 30.625 20C30.625 21.9143 29.375 23.1253 29.375 23.1253" stroke="#EFEFEF" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M23.125 1.875L11.25 11.875H4.375C2.9943 11.875 1.875 12.9943 1.875 14.375V25.625C1.875 27.0057 2.9943 28.125 4.375 28.125H11.25L23.125 38.125V1.875Z" stroke="#EFEFEF" stroke-width="3.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/co.meldstudio.streamdeck.sdPlugin/assets/iconSpeaker.png b/co.meldstudio.streamdeck.sdPlugin/assets/iconSpeaker.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca04b46574e76a65a91f782c58a0500f0d19b764
GIT binary patch
literal 1352
zcma)+`#aMM9LK-zqLp^CmFpx&Eyknd8XHR}vr24ZJ136B-1aanmt>O4$)n2%S<_J=
z#;`3Woz5zHbk=g2TPdWa*+sR=W$WlK=zN~%{dxcP`sMR{UgxoxeIOGH6951}A;IWF
zt6laZ#)hj~8Z><m01VcLpivPt9r-Ke!HM8ay$jMeq)!Rk0BU+I{V@Dq9sQa~0Q~QW
z^iGr39eqRtPjkThB}r#(j1KLi?~BWxAKA{u+#1KFQ^$7MY%SQlEFEqaTz1l3#s6%?
zV=i=&LaBVNo+?6I5ekJ5^!4jaL81b`T=6X?UPB7}jL9wqoNK2VK2L>KG;-%qdYRky
z@a_8sRHIXHbDInp4C!UT^jJ!Fo>RfLAlGnkHfze4j;QuJm46?KhrK@o?B(EiOo=Hf
z!Rnv4)v;bs8yVZ^;q^(QZIJ#>rlb(z!sTm8WkWLH-;MnZh?C-3v~cH!Kh!+K0Tqsu
zTRxWiS3emPUe@+}F|tbc6@fQ6ke_dv4P}iE5+am;sxMjxFG{W73+HQ9gpskSg&-^0
zu$|MFj^uP#D6@om#xcoXDqZA$^Y5JPF}RS196lPABSbh5m7{jEHD?pH%C00O!V|T3
zDyFYaJRQOT(V$N+y&7O)_cPkxE@~N(SoMj>Y>h&p2=ejqNds47Myw{e6ew$*`!l#V
zwBJE@<M&dHl1iqQ-R}Jg6VaLqn!ZMC@r_G-LZc^38g>;w!!tZ<{3zxy&1cD>cSYJ5
zr?i=0Z1t+Ws~6T&`l2^z;2cqail6DB)iE?`_DPEiXjez4*qWv3RZQw;UdKsOogNeX
zKqb}zuX($NyAC|skminMn<@@A4zCceAKl#pli3kmWIYt_@iJGN#__3^IF~_?ZbZ4-
zjGRaa&FLn9&xOPi9ZJnuZR0{y21083<$+w~aq75!eN#SICW3SX*m2n4ea2Y4WKX!-
z*r-wym{WwIT9w%A*RwobE4v6>(MqV9)EIlR0aBlF*R2LaB+5fi?~Y?|8uKV;07gYs
z>Y{(UGKSLZjx}2ap*VcT2VS__gXtu(YZ1VR*E@eCHZQg91OiFW(>Ru<$0y-43QuPT
zTga8lV)k-LJ9D!$7H=EvZ<KNn0h#|E9ZUSd!3QRaGCN2k=<*v2I7dmRw|h|_4n=`c
z#PP3bS@8nHDw>bWc(m!&Y|4&>?NsWMX3v>sgHSaVp&s<Tr0`2!23OIT*qYH@;Dm02
zzAmAB5V->{M=uxj6!co$G##@c=QT>Y-YmE!L>0HvAg|$$V(D6Uv@MVF<+tQK5xAPS
z`MvTT2YPJe2;*Db_*J1A!VcpLSlmL(Zc^n31X8m9#VooiJh@ETQ0FD@xC|0YIkGp0
z3yTrawlmtGnOmvsR)HXg$LD*LuYB^A4ZNe}RP;akRn{fA-$`GluspHQuKBxZH?5Zr
z@!Nf9xw%&OO(VD%>1}7sV-D#ey0>-g&Yq}1&`eFgq?WicaV>H|z)B$~Z@bNdO57t9
z6It_HzfC`;&Z7wAotIh$trT7Il>6E?bI?=l$BI|_m6iQ)YEH$CuolO|?m%E3&3SP<
zn0%hJrY+mwvc;}#{L#8ZJI>;q-&rZWZqnmnI3(8v2Pt+Xuv}uBGgeRCOBWf7*ILf{
zd3#%&o4GU<X21I7_Y|71wOOdsZqv}Fw-?B0{o@6m;spB<JI<J_=Ea3A$o;<NBX0iY
sD2{XHOcXd_NS@Wr=V1PilaMEF01oZ>Npq+JydVAw*^5E51AeFf2N;=h;{X5v

literal 0
HcmV?d00001

diff --git a/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js b/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js
index 033bef5..f995436 100644
--- a/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js
+++ b/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js
@@ -127,7 +127,12 @@ class MeldStudioPropertyInspector {
 
 			for (let field of elements) {
 				const dom_field = document.getElementById(field);
-				dom_field.value = settings[field];
+				if (settings[field] !== undefined) {
+					dom_field.value = settings[field];
+				} else {
+					// Use the default value specified by the field.
+					this.settings[field] = dom_field.value;
+				}
 			}
 		});
 	}
diff --git a/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js b/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js
index 293e93a..2261105 100644
--- a/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js
+++ b/co.meldstudio.streamdeck.sdPlugin/libs/js/meldstudio.js
@@ -42,8 +42,8 @@ class MeldStudio {
 					this.emit('isRecordingChanged', this.meld.isRecording);
 				});
 
-				this.meld.gainUpdated.connect((id, gain, mute) => {
-					this.emit('gainChanged', id, gain, mute);
+				this.meld.gainUpdated.connect((trackId, gain, muted) => {
+					this.emit('gainChanged', { trackId, gain, muted });
 				});
 
 				this.ready = true;
diff --git a/co.meldstudio.streamdeck.sdPlugin/manifest.json b/co.meldstudio.streamdeck.sdPlugin/manifest.json
index 2a108a1..8e68a38 100644
--- a/co.meldstudio.streamdeck.sdPlugin/manifest.json
+++ b/co.meldstudio.streamdeck.sdPlugin/manifest.json
@@ -8,7 +8,7 @@
   "CodePath": "app.html",
   "Description": "Control Meld Studio.",
   "URL": "https://streamwithmeld.com",
-  "Version": "0.1.0",
+  "Version": "0.2.0",
   "OS": [
     {
       "Platform": "mac",
@@ -56,7 +56,7 @@
       "Name": "Adjust Volume",
       "States": [
         {
-          "Image": "assets/unmutedTrack-gif-preview",
+          "Image": "assets/iconSpeaker",
           "TitleColor": "#FFFFFF"
         }
       ],
@@ -64,7 +64,7 @@
         "Encoder"
       ],
       "Encoder": {
-        "layout": "$B1",
+        "layout": "$B2",
         "TriggerDescription": {
           "Rotate": "Adjust Volume",
           "Touch": "Adjust Volume",

From 73a9424a365c6140666daa46d7096251a58108ed Mon Sep 17 00:00:00 2001
From: Terry M <zv1n.fire@gmail.com>
Date: Wed, 31 May 2023 19:27:09 -0500
Subject: [PATCH 06/10] Added speakers.

---
 .../assets/iconSpeaker.png                     | Bin 1352 -> 742 bytes
 .../assets/iconSpeaker@2x.png                  | Bin 0 -> 1402 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 co.meldstudio.streamdeck.sdPlugin/assets/iconSpeaker@2x.png

diff --git a/co.meldstudio.streamdeck.sdPlugin/assets/iconSpeaker.png b/co.meldstudio.streamdeck.sdPlugin/assets/iconSpeaker.png
index ca04b46574e76a65a91f782c58a0500f0d19b764..92e1051320e8d948bc80cbdd59dcd478bd9def4e 100644
GIT binary patch
literal 742
zcmV<C0vY{@P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0((hBK~#7F?U><F
z+dvS77f=2>u7K+x(1GcIRDfK8qY7eIkaPg406MTz0Zs)`Dllol$y;kR78+q>!J^af
zzL}kqWS{JNv%9x@B7_h^2qA<JLI@#*5JCtcq$8Wn<_xxieHHQ;h;p?l_@^d4Gm?lf
zkGX+;lt}m>kpOYNVfZ4E(YrtpCSbUQo!O)HXf#@Hx7$P_pw|#HaaOVy=LhTp;{0hb
zcdE%;oas#<T_A>gSg=RS$z+ni9$L;-VefH$DUP^?n0d&R>_w=ORIXD9^Ih7rhUNC&
zYy3{uM%XU631s4^haB3GbWs;r+**!6#lZV#Qh1TRUz7Vn9PkV=-Iesus|b06Ww7&O
z#VNtOOp2VP%psUdY2X=Ry9A0I>25q8&%}otDMDDqxwQLNC8|R45Lzd}ep`axVO~_`
z9+w?$Fam+86iNBE7EYOsK^z#8K&g!?PSsof+W1Kv7>qy`P9;I!h#}>mYC)Jce8r^>
z8d8XrXG3|-n@(+f_X7QtLWH#TJlOb49Ej$)<2m3pS}i|14zXr6*li{bcnYKya?oRo
zYVA@Xht06?T)H#2Q9UaY2RuV;Df_$-8f*$%bv?4MUN6yWt=0$EtZI*iMVw2qh|}7~
zWor<mII=jZo3ETBDLK4!DNeZNAPb*G(`UAAUrQmDwh?1|zwJVGPO$6rg<*P-6X}tP
zCj@(R2h+w@lksj_$Kp?(n5zOm)VBOrr&ocLhBN70iiDf!%~Jxs6}<~o0--bq&Fjzm
z7ATrR(drzxWZRXfDrtzc!0=g|+J-Jf*J?l{P1IT*XrY-3A%qY@2qA<JLI@#*5JHIZ
YAOGIqzWUETwEzGB07*qoM6N<$g4b$AOaK4?

literal 1352
zcma)+`#aMM9LK-zqLp^CmFpx&Eyknd8XHR}vr24ZJ136B-1aanmt>O4$)n2%S<_J=
z#;`3Woz5zHbk=g2TPdWa*+sR=W$WlK=zN~%{dxcP`sMR{UgxoxeIOGH6951}A;IWF
zt6laZ#)hj~8Z><m01VcLpivPt9r-Ke!HM8ay$jMeq)!Rk0BU+I{V@Dq9sQa~0Q~QW
z^iGr39eqRtPjkThB}r#(j1KLi?~BWxAKA{u+#1KFQ^$7MY%SQlEFEqaTz1l3#s6%?
zV=i=&LaBVNo+?6I5ekJ5^!4jaL81b`T=6X?UPB7}jL9wqoNK2VK2L>KG;-%qdYRky
z@a_8sRHIXHbDInp4C!UT^jJ!Fo>RfLAlGnkHfze4j;QuJm46?KhrK@o?B(EiOo=Hf
z!Rnv4)v;bs8yVZ^;q^(QZIJ#>rlb(z!sTm8WkWLH-;MnZh?C-3v~cH!Kh!+K0Tqsu
zTRxWiS3emPUe@+}F|tbc6@fQ6ke_dv4P}iE5+am;sxMjxFG{W73+HQ9gpskSg&-^0
zu$|MFj^uP#D6@om#xcoXDqZA$^Y5JPF}RS196lPABSbh5m7{jEHD?pH%C00O!V|T3
zDyFYaJRQOT(V$N+y&7O)_cPkxE@~N(SoMj>Y>h&p2=ejqNds47Myw{e6ew$*`!l#V
zwBJE@<M&dHl1iqQ-R}Jg6VaLqn!ZMC@r_G-LZc^38g>;w!!tZ<{3zxy&1cD>cSYJ5
zr?i=0Z1t+Ws~6T&`l2^z;2cqail6DB)iE?`_DPEiXjez4*qWv3RZQw;UdKsOogNeX
zKqb}zuX($NyAC|skminMn<@@A4zCceAKl#pli3kmWIYt_@iJGN#__3^IF~_?ZbZ4-
zjGRaa&FLn9&xOPi9ZJnuZR0{y21083<$+w~aq75!eN#SICW3SX*m2n4ea2Y4WKX!-
z*r-wym{WwIT9w%A*RwobE4v6>(MqV9)EIlR0aBlF*R2LaB+5fi?~Y?|8uKV;07gYs
z>Y{(UGKSLZjx}2ap*VcT2VS__gXtu(YZ1VR*E@eCHZQg91OiFW(>Ru<$0y-43QuPT
zTga8lV)k-LJ9D!$7H=EvZ<KNn0h#|E9ZUSd!3QRaGCN2k=<*v2I7dmRw|h|_4n=`c
z#PP3bS@8nHDw>bWc(m!&Y|4&>?NsWMX3v>sgHSaVp&s<Tr0`2!23OIT*qYH@;Dm02
zzAmAB5V->{M=uxj6!co$G##@c=QT>Y-YmE!L>0HvAg|$$V(D6Uv@MVF<+tQK5xAPS
z`MvTT2YPJe2;*Db_*J1A!VcpLSlmL(Zc^n31X8m9#VooiJh@ETQ0FD@xC|0YIkGp0
z3yTrawlmtGnOmvsR)HXg$LD*LuYB^A4ZNe}RP;akRn{fA-$`GluspHQuKBxZH?5Zr
z@!Nf9xw%&OO(VD%>1}7sV-D#ey0>-g&Yq}1&`eFgq?WicaV>H|z)B$~Z@bNdO57t9
z6It_HzfC`;&Z7wAotIh$trT7Il>6E?bI?=l$BI|_m6iQ)YEH$CuolO|?m%E3&3SP<
zn0%hJrY+mwvc;}#{L#8ZJI>;q-&rZWZqnmnI3(8v2Pt+Xuv}uBGgeRCOBWf7*ILf{
zd3#%&o4GU<X21I7_Y|71wOOdsZqv}Fw-?B0{o@6m;spB<JI<J_=Ea3A$o;<NBX0iY
sD2{XHOcXd_NS@Wr=V1PilaMEF01oZ>Npq+JydVAw*^5E51AeFf2N;=h;{X5v

diff --git a/co.meldstudio.streamdeck.sdPlugin/assets/iconSpeaker@2x.png b/co.meldstudio.streamdeck.sdPlugin/assets/iconSpeaker@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..195599015e01de13bca117dc5c72936df6311254
GIT binary patch
literal 1402
zcma)6=~vPT6#cm`#AK9Eu9!I%DS9k(O+m@j63I*fg_(4W+~p`nE}58FIXSkVxrU9E
znxd#cF4;6x+OZ*W!L2McBSSzdDi>_<FPM4f+;`7=AMX9|&bt?J*n?n06GH$1zybc4
z5H%OCLtj_jC4STQ)nt(3Pe=s-(B^e$0Ogfi)k}@kkb^z|TWB_?9<(XwAT$7Q{s65W
z*8u>XjR6>RC|yJLT5)8;e{1ie<SqF#WhX#OsbL&N+^=QaF!VwE6`Imv*s{Biq~mG~
z7{4NGY>3pLfAV~J)%6qGzJOb0yL{%vUW*;M+g2pQZCzLGG}S);RiZHmhET3hyiiW%
zBd-Yrf`{7Lbs(@X*DFhOyPBXP`+mV@6an@%Q}th_0!tgXb7-x!o%{LLeFF=lQwU>=
zR5%>vW>W34oMJz>0N;)>;NUF`N|ui;9Iz|-F%$#;a1J=Y!SkxcAT-77?{^hZZZHce
zTklcjq~1<we@C@A59z?=uaS#~q`*I0`s<OWMY9;eo=v|gdAb7&curQySk|BY@!;U%
z))z}*<(jXFyupE-9McRKYjltps`y=b+1!6gV*WueU$a0Q8Jk-4Gm{Qm*?nzKNO6Q!
z7t+qz#(7I5OWg0?9kV?;my%J#$HOxPNE?!3)M~csJY|RUT3jq5cI|HI^!15nLwFzp
z{P~qzJv`_^YTLV|HD(x2c`7VJC6~+nJUl#-Ar;sWvq>%$#`?+mIl>**Z=<>8N0CZF
zi>DRe>HP*5(i?LdzlCo1jE;RuXC#R0_ZB=SFkP#>sK#*B7jek@{Iy8C<eANuS{3dU
ziyNtZ5t~#9j?ia;pXRcrp{v*AksR&Qri@6mG)mSgozzUL#7mOwo)Epjh2}nQc>9Js
z4?o_N?2KcB<VPBYS4ow}_w~S~RzwGB50!he*wLb4e5yIxVGyhtTB0<Hk0l0Xb`v2N
z0-{JZMMkXFaRG>llz_fIlr6ZNIjLROm;;dtq3u3a95&>jK8_&XAFR~ZD^vMq=3{AQ
zh1S}2ELX>}P9j&h8fYZZ$DOW+)}`Kas=|^;vcR+ZqM4kAZ0b3HSz4a7<lUx-q&7L@
zjMPGC4xjmv7wq(KI!@%64=`i2E*^`@PHH`cL=m-AwnZs1afH;ovl;#-GKHdmy;9g#
zz0Dp+u#E85OFV*v&i{yrBCYEXd}D=a?c@<m$<0N)t+>P8Io}tLroySBm^bwFm@eIN
zx`)Gf1n7DOb@$>f8trM5>r9hQpc02v4tidZdnK(v%IVd(s?og=O1Dm5r$9D{+D(vQ
zR&slCdrfYE#w_Bq8^oP&7o8~K1ub;w8-%S$vcVZ+$)kS#B_Ue~so-t<pm@)LoftXB
z{9ZeLU7&=rgZN!6Zk}m3x$GknB|h|W7E>OaP%Nphb(6JU1&bsc>D!}u1;_}?nKi$e
z+ez$}uC7cTpYKw#`q@)D@SdJo+W+`xX=m4i4#o<V<%)xK&fiPEWxgE3Z}XsMWtkDS
zj^HCDckHoGIONNi-j=bu`@?;~GgbZK8q(^-jj+WoRw7Yx$7vp1=o~7aNT1*FefkM)
z9!-qjbESFEOx`I=e6ZGP41R|DRQg)GtgIhF%PhSa)NFgy8Su@f+b`{c#9t&Ev}Sml
zHe0ohKmIA!inBE5bzZ`#opgB=49#-DLkk><EQhG3RQ0KQ8A5&02GdzDcXyKuGgqd9
ztkqwBU#|LAla4;?G!1KfcPSpDeKOZoM6n*R;*3eFUS8UcI^=0Q;^b|N=GdprghMDp
jvh;2~2m60A33ciwVAGZpH-|pVThFh616T~(=U2wR{qB9T

literal 0
HcmV?d00001


From cdb4fb59ab1948dc050e071ee62c3857717f3764 Mon Sep 17 00:00:00 2001
From: Terry M <zv1n.fire@gmail.com>
Date: Wed, 31 May 2023 19:39:05 -0500
Subject: [PATCH 07/10] Minor text fixup.

---
 co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js b/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js
index f995436..0063c17 100644
--- a/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js
+++ b/co.meldstudio.streamdeck.sdPlugin/libs/js/inspector.js
@@ -109,7 +109,7 @@ class MeldStudioPropertyInspector {
 	initializeText(action, elements) {
 		for (let id of elements) {
 			const el = document.getElementById(id);
-			console.assert(el.id, 'Select element not found');
+			console.assert(el.id, 'Input element not found');
 			if (!el) continue;
 
 			this.settings[el] = '';

From a38d4bd7b5abaa4153f9b1532eff20e378dd8f47 Mon Sep 17 00:00:00 2001
From: Terry M <zv1n.fire@gmail.com>
Date: Wed, 31 May 2023 19:43:39 -0500
Subject: [PATCH 08/10] Add stepper translations.

---
 co.meldstudio.streamdeck.sdPlugin/de.json | 9 +++++----
 co.meldstudio.streamdeck.sdPlugin/en.json | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/co.meldstudio.streamdeck.sdPlugin/de.json b/co.meldstudio.streamdeck.sdPlugin/de.json
index ea76a94..5ce6177 100644
--- a/co.meldstudio.streamdeck.sdPlugin/de.json
+++ b/co.meldstudio.streamdeck.sdPlugin/de.json
@@ -27,12 +27,13 @@
         "Tooltip": "Starten oder stoppen Sie einen Livestream."
     },
     "co.meldstudio.streamdeck.volume-stepper": {
-        "Name": "Adjust Volume",
-        "Tooltip": "Adjust the volume of a specified audio track.",
+        "Name": "Lautstärkeregler",
+        "Tooltip": "Steuern Sie die Lautstärke einer bestimmten Audiospur.",
         "Encoder": {
             "TriggerDescription": {
-                "Rotate": "Adjust Volume",
-                "Touch": "Adjust Volume"
+                "Rotate": "Lautstärkeregler",
+                "Touch": "Lautstärkeregler",
+                "Push": "Spur stumm"
             }
         }
     },
diff --git a/co.meldstudio.streamdeck.sdPlugin/en.json b/co.meldstudio.streamdeck.sdPlugin/en.json
index 2302be0..be042e8 100644
--- a/co.meldstudio.streamdeck.sdPlugin/en.json
+++ b/co.meldstudio.streamdeck.sdPlugin/en.json
@@ -32,7 +32,8 @@
         "Encoder": {
             "TriggerDescription": {
                 "Rotate": "Adjust Volume",
-                "Touch": "Adjust Volume"
+                "Touch": "Adjust Volume",
+                "Push": "Mute Track"
             }
         }
     },

From 868c148fe97c1ec01a806dedcfb5f6ec1c5eecd4 Mon Sep 17 00:00:00 2001
From: Terry M <zv1n.fire@gmail.com>
Date: Thu, 1 Jun 2023 12:11:36 -0500
Subject: [PATCH 09/10] Unregister everything on connection close.

---
 .../actions/volume-stepper/plugin.js                      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
index 4cfea98..9b40506 100644
--- a/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
+++ b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
@@ -88,7 +88,8 @@ class VolumeStepper extends MeldStudioPlugin {
         const state = muted ? 0 : 1;
 
         this.trackInfo[track] = { ...this.trackInfo[track], name, muted };
-
+        
+        this.setGainAndMute(context, this.trackInfo[track]);
         $SD.setState(context, state);
       });
     });
@@ -103,6 +104,11 @@ class VolumeStepper extends MeldStudioPlugin {
         this.setGainAndMute(context, info);
       });
     });
+
+    $MS.on("closed", () => {
+      // reset all registrations.
+      this.unregisterCallbacks = {};
+    });
   }
 
   setGainAndMute(context, { gain, muted, name }) {

From aef7125da183593cbe101cf39d3d5f57efc9810a Mon Sep 17 00:00:00 2001
From: Terry M <zv1n.fire@gmail.com>
Date: Thu, 1 Jun 2023 14:29:38 -0500
Subject: [PATCH 10/10] Cleaning up StreamDeck plugins a bit.

---
 .../actions/show-scene/plugin.js              | 38 ++++++++++++-------
 .../actions/toggle-layer/plugin.js            |  2 +-
 .../actions/volume-stepper/plugin.js          | 16 ++++++--
 co.meldstudio.streamdeck.sdPlugin/app.html    |  3 +-
 4 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/show-scene/plugin.js b/co.meldstudio.streamdeck.sdPlugin/actions/show-scene/plugin.js
index e9d90c3..7f136d8 100644
--- a/co.meldstudio.streamdeck.sdPlugin/actions/show-scene/plugin.js
+++ b/co.meldstudio.streamdeck.sdPlugin/actions/show-scene/plugin.js
@@ -1,10 +1,5 @@
 class ShowScene extends MeldStudioPlugin {
-  errorState = [
-    {
-      image: "assets/sceneOn",
-      title: "",
-    },
-  ];
+  sceneRequested = null;
 
   constructor() {
     super("co.meldstudio.streamdeck.show-scene");
@@ -13,22 +8,37 @@ class ShowScene extends MeldStudioPlugin {
       const { scene } = this.getSettings(context);
       if (!scene) return;
 
+      this.sceneRequested = scene;
+      this.updateState(context);
+
       if ($MS.meld?.showScene) $MS.meld.showScene(scene);
     });
 
     $MS.on("sessionChanged", (session) => {
+      this.sceneRequested = null;
+
       this.forAllContexts((context, settings) => {
-        const { scene } = settings;
-        if (!scene) return;
+        this.updateState(context);
+      });
+    });
+  }
 
-        if (!session.items[scene])
-          return $SD.setState(context, 0);
+  updateState(context) {
+    const { scene } = this.getSettings(context);
+    const session = $MS?.meld?.session;
 
-        const state = session.items[scene].current ? 1 : 0;
+    const state = (() => {
+      if (!scene) return 0;
+      if (!session || !session?.items) return 0;
 
-        $SD.setState(context, state);
-      });
-    });
+      const item = session.items[scene];
+
+      if (!item) return 0;
+      if (scene == this.sceneRequested) return 1;
+      return item.current ? 1 : 0;
+    })();
+
+    $SD.setState(context, state);
   }
 }
 
diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/toggle-layer/plugin.js b/co.meldstudio.streamdeck.sdPlugin/actions/toggle-layer/plugin.js
index e6056e1..ec11ee1 100644
--- a/co.meldstudio.streamdeck.sdPlugin/actions/toggle-layer/plugin.js
+++ b/co.meldstudio.streamdeck.sdPlugin/actions/toggle-layer/plugin.js
@@ -13,7 +13,7 @@ class ToggleLayer extends MeldStudioPlugin {
       this.forAllContexts((context, settings) => {
         const { layer } = settings;
         if (!layer) return;
-        if (!session.items[layer])
+        if (!session?.items || !session?.items[layer])
           return $SD.setState(context, 0);
 
         const state = session.items[layer].visible ? 1 : 0;
diff --git a/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
index 9b40506..7ddbdaf 100644
--- a/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
+++ b/co.meldstudio.streamdeck.sdPlugin/actions/volume-stepper/plugin.js
@@ -82,15 +82,15 @@ class VolumeStepper extends MeldStudioPlugin {
     $MS.on("sessionChanged", (session) => {
       this.forAllContexts((context, { track }) => {
         if (!track) return;
-        if (!session.items[track]) return $SD.setState(context, 1);
+        if (!session?.items) return;
+        if (!session?.items[track]) return;
 
         const { name, muted } = session.items[track];
         const state = muted ? 0 : 1;
 
         this.trackInfo[track] = { ...this.trackInfo[track], name, muted };
-        
+
         this.setGainAndMute(context, this.trackInfo[track]);
-        $SD.setState(context, state);
       });
     });
 
@@ -163,11 +163,19 @@ class VolumeStepper extends MeldStudioPlugin {
     this.unregisterCallbacks[context] = undefined;
   }
 
+  getNameForTrack(track) {
+    const defaultName = "Adjust Volume";
+    if (!$MS?.meld?.session?.items) return defaultName;
+
+    const name = $MS.meld.session.items[track]?.name;
+    return name ? name : defaultName;
+  }
+
   connectGain(context, track) {
     this.trackInfo[track] = {
       gain: 0.0,
       muted: false,
-      name: $MS.meld ? $MS.meld.session.items[track]?.name  : "Adjust Volume"
+      name: this.getNameForTrack(track),
     };
 
     this.setGainAndMute(context, this.trackInfo[track]);
diff --git a/co.meldstudio.streamdeck.sdPlugin/app.html b/co.meldstudio.streamdeck.sdPlugin/app.html
index e0867df..7acc506 100644
--- a/co.meldstudio.streamdeck.sdPlugin/app.html
+++ b/co.meldstudio.streamdeck.sdPlugin/app.html
@@ -30,8 +30,9 @@
     <script src="actions/show-scene/plugin.js"></script>
     <script src="actions/toggle-layer/plugin.js"></script>
     <script src="actions/toggle-effect/plugin.js"></script>
-    <script src="actions/volume-stepper/plugin.js"></script>
+    <script src="actions/toggle-mute/plugin.js"></script>
     <script src="actions/toggle-stream/plugin.js"></script>
     <script src="actions/toggle-record/plugin.js"></script>
+    <script src="actions/volume-stepper/plugin.js"></script>
 
 </html>
