Merge pull request tv2#259 from tv2/master

Fix: Merge features from master into develop
nrkno · May 15, 2023 · 8a46aab · 8a46aab
2 parents c9260e3 + 64ac644
commit 8a46aab
Show file tree

Hide file tree

Showing 10 changed files with 878 additions and 76 deletions.
diff --git a/README.md b/README.md
@@ -68,6 +68,14 @@ docker volume create sisyfos-vol
 sudo docker run --mount source=sisyfos-vol,target=/opt/sisyfos-audio-controller/storage --network="host" --restart always tv2media/sisyfos-audio-controller:develop
 ```
 
+### Run as Docker: (On windows)
+
+```
+docker pull tv2media/sisyfos-audio-controller:develop
+docker volume create sisyfos-vol
+docker run --mount source=sisyfos-vol,target=/opt/sisyfos-audio-controller/storage -p 1176:1176 -p 5255:5255 --restart always tv2media/sisyfos-audio-controller:develop
+```
+
 ### Install Local node host:
 
 (Be aware that a server reload will quit server and you need an external source to restart)

diff --git a/desktop/package.json b/desktop/package.json
@@ -13,7 +13,7 @@
         "server": "^0.0.0"
     },
     "devDependencies": {
-        "electron": "16.0.4",
+        "electron": "16.2.6",
         "electron-builder": "22.14.5"
     },
     "build": {

diff --git a/server/package.json b/server/package.json
@@ -16,13 +16,15 @@
         "@types/socket.io": "^3.0.2",
         "@types/webmidi": "^2.0.6",
         "jest": "^26.6.3",
-        "typescript": "^4.5.5",
-        "ts-jest": "^26.5.3"
+        "ts-jest": "^26.5.3",
+        "typescript": "^4.5.5"
     },
     "dependencies": {
         "@babel/core": "^7.13.10",
         "@tv2media/logger": "^1.2.2",
+        "atem-connection": "^3.2.0",
         "casparcg-connection": "^5.1.0",
+        "client": "^0.0.0",
         "emberplus-connection": "^0.0.4",
         "express": "^4.17.1",
         "node-emberplus": "https://github.com/olzzon/node-emberplus#feat/export-ber",
@@ -35,7 +37,6 @@
         "tslib": "^2.3.1",
         "vmix-js-utils": "^4.0.7",
         "web-midi-api": "^2.0.8",
-        "webmidi": "^2.5.2",
-        "client": "^0.0.0"
+        "webmidi": "^2.5.2"
     }
 }
diff --git a/server/src/utils/MixerConnection.ts b/server/src/utils/MixerConnection.ts
@@ -29,6 +29,7 @@ import {
     storeSetOutputLevel,
 } from '../../../shared/src/actions/channelActions'
 import { storeFaderLevel } from '../../../shared/src/actions/faderActions'
+import { AtemMixerConnection } from './mixerConnections/AtemConnection'
 
 export class MixerGenericConnection {
     store: any
@@ -100,15 +101,20 @@ export class MixerGenericConnection {
                     this.mixerProtocol[index] as IMixerProtocol,
                     index
                 )
+            } else if (this.mixerProtocol[index].protocol === 'ATEM') {
+                this.mixerConnection[index] = new AtemMixerConnection(
+                    this.mixerProtocol[index],
+                    index
+                )
             }
         })
 
-        //Setup timers for fade in & out
+        // Setup timers for fade in & out
         this.initializeTimers()
     }
 
     initializeTimers = () => {
-        //Setup timers for fade in & out
+        // Setup timers for fade in & out
         this.mixerTimers = []
         state.channels[0].chMixerConnection.forEach(
             (chMixerConnection: IchMixerConnection, mixerIndex: number) => {
@@ -526,3 +532,28 @@ export class MixerGenericConnection {
         this.fade(fadeTime, mixerIndex, channelIndex, outputLevel, 0)
     }
 }
+
+export interface MixerConnection {
+    updatePflState: (channelIndex: number) => void
+    updateMuteState: (channelIndex: number, muteOn: boolean) => void
+    updateAMixState: (channelIndex: number, amixOn: boolean) => void
+    updateNextAux: (channelIndex: number, level: number) => void
+    updateFx: (
+        fxParam: fxParamsList,
+        channelIndex: number,
+        level: number
+    ) => void
+    updateAuxLevel: (
+        channelIndex: number,
+        auxSendIndex: number,
+        auxLevel: number
+    ) => void
+    updateChannelName: (channelIndex: number) => void
+    injectCommand: (command: string[]) => void
+    updateChannelSetting: (
+        channelIndex: number,
+        setting: string,
+        value: string
+    ) => void
+    updateFadeIOLevel: (channelIndex: number, level: number) => void
+}