feat: Set channel label on mixer from Sisyfos and from Automation

olzzon · Jun 29, 2019 · 35fbc34 · 35fbc34
1 parent 5b83282
commit 35fbc34
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 0 deletions.
diff --git a/src/utils/AutomationConnection.ts b/src/utils/AutomationConnection.ts
@@ -85,6 +85,7 @@ export class AutomationConnection {
                         channel: ch -1,
                         label: message.args[0]
                     });
+                    window.mixerGenericConnection.updateChannelName(ch-1);
             } else if (this.checkOscCommand(message.address, this.automationProtocol.fromAutomation
                 .X_MIX)) {
                 window.storeRedux.dispatch({

diff --git a/src/utils/CasparCGConnection.ts b/src/utils/CasparCGConnection.ts
@@ -227,5 +227,9 @@ export class CasparCGConnection {
             }
         }
     }
+
+    updateChannelName(channelIndex: number) {
+        //CasparCG does not need Labels.
+    }
 }
 
diff --git a/src/utils/EmberMixerConnection.ts b/src/utils/EmberMixerConnection.ts
@@ -231,5 +231,16 @@ export class EmberMixerConnection {
         );
     }
 
+    updateChannelName(channelIndex: number) {
+        let channelType = this.store.channels[0].channel[channelIndex].channelType;
+        let channelTypeIndex = this.store.channels[0].channel[channelIndex].channelTypeIndex;
+        let channelName = this.store.channels[0].channel[channelIndex].label;
+        this.sendOutMessage(
+            this.mixerProtocol.channelTypes[channelType].toMixer.CHANNEL_NAME[0].mixerMessage,
+            channelTypeIndex+1,
+            channelName,
+            "string"
+        );
+    }
 }
 
diff --git a/src/utils/MidiMixerConnection.ts b/src/utils/MidiMixerConnection.ts
@@ -162,5 +162,15 @@ return true;
         );
     }
 
+
+    updateChannelName(channelIndex: number) {
+        let channelName = this.store.channels[0].channel[channelIndex].label;
+        this.sendOutMessage(
+            this.mixerProtocol.channelTypes[0].toMixer.CHANNEL_NAME[0].mixerMessage,
+            channelIndex+1,
+            channelName
+        );
+    }
+
 }
 
diff --git a/src/utils/MixerConnection.ts b/src/utils/MixerConnection.ts
@@ -62,6 +62,10 @@ export class MixerGenericConnection {
         this.mixerConnection.updatePflState(channelIndex);
     }
 
+    updateChannelName(channelIndex: number) {
+        this.mixerConnection.updateChannelName(channelIndex);
+    }
+
     fadeInOut (channelIndex: number, fadeTime: number){
         //Clear Old timer or set Fade to active:
         if (this.store.channels[0].channel[channelIndex].fadeActive) {

diff --git a/src/utils/OscMixerConnection.ts b/src/utils/OscMixerConnection.ts
@@ -251,5 +251,17 @@ export class OscMixerConnection {
             "f"
         );
     }
+
+    updateChannelName(channelIndex: number) {
+        let channelType = this.store.channels[0].channel[channelIndex].channelType;
+        let channelTypeIndex = this.store.channels[0].channel[channelIndex].channelTypeIndex;
+        let channelName = this.store.channels[0].channel[channelIndex].label;
+        this.sendOutMessage(
+            this.mixerProtocol.channelTypes[channelType].toMixer.CHANNEL_NAME[0].mixerMessage,
+            channelTypeIndex+1,
+            channelName,
+            "s"
+        );
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -227,5 +227,9 @@ export class CasparCGConnection { @@
                 }
             }
         }
+        updateChannelName(channelIndex: number) {
+            //CasparCG does not need Labels.
+        }
     }