Feat: v26 15 Mix support

bitfocus · Oct 28, 2022 · ab58692 · ab58692
1 parent ed4a875
commit ab58692
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 35 deletions.
diff --git a/src/actions.ts b/src/actions.ts
@@ -961,7 +961,7 @@ interface CommandCallback {
 interface MixSelectCallback {
   action: 'mixSelect'
   options: Readonly<{
-    mix: 0 | 1 | 2 | 3
+    mix: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14
   }>
 }
 
@@ -3106,6 +3106,17 @@ export function getActions(instance: VMixInstance): VMixActions {
             { id: 1, label: '2' },
             { id: 2, label: '3' },
             { id: 3, label: '4' },
+            { id: 4, label: '5' },
+            { id: 5, label: '6' },
+            { id: 6, label: '7' },
+            { id: 7, label: '8' },
+            { id: 8, label: '9' },
+            { id: 9, label: '10' },
+            { id: 10, label: '1' },
+            { id: 11, label: '12' },
+            { id: 12, label: '13' },
+            { id: 13, label: '14' },
+            { id: 14, label: '15' },
           ],
         },
       ],

diff --git a/src/data.ts b/src/data.ts
@@ -163,7 +163,7 @@ export interface VMixData {
   inputs: Input[]
   overlays: Overlay[]
   transitions: Transition[]
-  mix: [Mix, Mix, Mix, Mix]
+  mix: Mix[]
   audio: AudioBus[]
   status: Status
   recording: Recording
@@ -208,7 +208,7 @@ export class VMixData {
   inputs: Input[]
   overlays: Overlay[]
   transitions: Transition[]
-  mix: [Mix, Mix, Mix, Mix]
+  mix: Mix[]
   audio: AudioBus[]
   status: Status
   recording: Recording
@@ -226,40 +226,17 @@ export class VMixData {
     this.inputs = []
     this.overlays = []
     this.transitions = []
-    this.mix = [
-      {
-        number: 1,
-        active: true,
+    this.mix = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15].map((mixNumber) => {
+      return {
+        number: mixNumber,
+        active: mixNumber === 1,
         preview: 0,
         program: 0,
         previewTally: [],
         programTally: [],
-      },
-      {
-        number: 2,
-        active: false,
-        preview: 0,
-        program: 0,
-        previewTally: [],
-        programTally: [],
-      },
-      {
-        number: 3,
-        active: false,
-        preview: 0,
-        program: 0,
-        previewTally: [],
-        programTally: [],
-      },
-      {
-        number: 4,
-        active: false,
-        preview: 0,
-        program: 0,
-        previewTally: [],
-        programTally: [],
-      },
-    ]
+      }
+    })
+
     this.audio = []
     this.status = {
       fadeToBlack: false,

diff --git a/src/feedback.ts b/src/feedback.ts
@@ -347,7 +347,7 @@ interface InputOnMultiviewCallback {
 interface MixSelectCallback {
   type: 'mixSelect'
   options: Readonly<{
-    mix: 0 | 1 | 2 | 3
+    mix: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14
     fg: number
     bg: number
   }>
@@ -1617,6 +1617,17 @@ export function getFeedbacks(instance: VMixInstance): VMixFeedbacks {
             { id: 1, label: '2' },
             { id: 2, label: '3' },
             { id: 3, label: '4' },
+            { id: 4, label: '5' },
+            { id: 5, label: '6' },
+            { id: 6, label: '7' },
+            { id: 7, label: '8' },
+            { id: 8, label: '9' },
+            { id: 9, label: '10' },
+            { id: 10, label: '11' },
+            { id: 11, label: '12' },
+            { id: 12, label: '13' },
+            { id: 13, label: '14' },
+            { id: 14, label: '15' },
           ],
         },
         options.foregroundColor,

diff --git a/src/index.ts b/src/index.ts
@@ -35,7 +35,7 @@ interface RoutingData {
     destinationInput: null | string
     destinationLayer: null | string
   }
-  mix: 0 | 1 | 2 | 3
+  mix: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14
 }
 
 /**

diff --git a/src/utils.ts b/src/utils.ts
@@ -93,6 +93,17 @@ export const options: Options = {
       { id: 1, label: '2' },
       { id: 2, label: '3' },
       { id: 3, label: '4' },
+      { id: 4, label: '5' },
+      { id: 5, label: '6' },
+      { id: 6, label: '7' },
+      { id: 7, label: '8' },
+      { id: 8, label: '9' },
+      { id: 9, label: '10' },
+      { id: 10, label: '11' },
+      { id: 11, label: '12' },
+      { id: 12, label: '13' },
+      { id: 13, label: '14' },
+      { id: 14, label: '15' },
       { id: -1, label: 'Selected' },
     ],
   },