feat: vmix - initial vmix setup (copy form osc)

tv2 · May 26, 2021 · 7784eb2 · 7784eb2
1 parent 233d36f
commit 7784eb2
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -69,6 +69,7 @@
         "i18next-browser-languagedetector": "^6.1.1",
         "jquery": "^3.6.0",
         "node-emberplus": "https://github.com/olzzon/node-emberplus#feat/export-ber",
+        "node-vmix": "^1.5.2",
         "nouislider": "^14.6.3",
         "nouislider-react": "^3.4.0",
         "osc": "https://github.com/olzzon/tv2-osc.js-no-serialport.git",

diff --git a/server/constants/MixerProtocolPresets.ts b/server/constants/MixerProtocolPresets.ts
@@ -12,6 +12,7 @@ import { YamahaQLCL } from './mixerProtocols/yamahaQLCL'
 import { SSLSystemT } from './mixerProtocols/SSLsystemT'
 import { StuderOnAirMaster } from './mixerProtocols/StuderOnAirEmber'
 import { StuderVistaMaster } from './mixerProtocols/StuderVistaEmber'
+import { VMix } from './mixerProtocols/vMix'
 
 // Interface:
 import { IMixerProtocolGeneric } from './MixerProtocolInterface'
@@ -33,6 +34,7 @@ export const MixerProtocolPresets: {
         sslSystemT: SSLSystemT,
         studerOnAirMaster: StuderOnAirMaster,
         studerVistaMaster: StuderVistaMaster,
+        vMix: VMix,
     },
     {
         casparCGMaster: CasparCGMaster,

diff --git a/server/utils/MixerConnection.ts b/server/utils/MixerConnection.ts
@@ -10,6 +10,7 @@ import {
     fxParamsList,
 } from '../constants/MixerProtocolInterface'
 import { OscMixerConnection } from './mixerConnections/OscMixerConnection'
+import { VMixMixerConnection } from './mixerConnections/VMixMixerConnection'
 import { MidiMixerConnection } from './mixerConnections/MidiMixerConnection'
 import { QlClMixerConnection } from './mixerConnections/YamahaQlClConnection'
 import { SSLMixerConnection } from './mixerConnections/SSLMixerConnection'
@@ -94,6 +95,11 @@ export class MixerGenericConnection {
                     this.mixerProtocol[index] as IMixerProtocol,
                     index
                 )
+            } else if (this.mixerProtocol[index].protocol === 'VMIX') {
+                this.mixerConnection[index] = new VMixMixerConnection(
+                    this.mixerProtocol[index] as IMixerProtocol,
+                    index
+                )
             }
         })
 

diff --git a/yarn.lock b/yarn.lock
@@ -1338,6 +1338,13 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
 
+axios@^0.21.1:
+  version "0.21.1"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
+  dependencies:
+    follow-redirects "^1.10.0"
+
 babel-jest@^26.6.3:
   version "26.6.3"
   resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056"
@@ -3156,6 +3163,11 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
+follow-redirects@^1.10.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
+  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
+
 for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -3253,7 +3265,7 @@ get-pkg-repo@^1.0.0:
   resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
   integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
   dependencies:
-    hosted-git-info "^2.8.9"
+    hosted-git-info "^2.1.4"
     meow "^3.3.0"
     normalize-package-data "^2.3.0"
     parse-github-repo-url "^1.3.0"
@@ -3493,9 +3505,9 @@ hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.1, hoist-non-react-
     lru-cache "^6.0.0"
 
 hosted-git-info@^2.1.4, hosted-git-info@^2.1.5:
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
-  integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hosted-git-info@^4.0.0:
   version "4.0.0"
@@ -5223,12 +5235,20 @@ node-releases@^1.1.70:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
   integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
 
+node-vmix@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/node-vmix/-/node-vmix-1.5.2.tgz#0da0e34cd0f318d70247e7d631b50e76d498f0ab"
+  integrity sha512-0V1MKpoa3vprx5igvpPnLHyvm0UY7spWEFjG/izn73zUp/JbaycT1NVfxNR9VT8rLlv5MmLJk9MZPyiYF2HARQ==
+  dependencies:
+    axios "^0.21.1"
+    querystring "^0.2.1"
+
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
-    hosted-git-info "^2.8.9"
+    hosted-git-info "^2.1.4"
     resolve "^1.10.0"
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
@@ -5277,7 +5297,7 @@ npm-package-arg@^4.2.0:
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-4.2.1.tgz#593303fdea85f7c422775f17f9eb7670f680e3ec"
   integrity sha1-WTMD/eqF98Qid18X+et2cPaA4+w=
   dependencies:
-    hosted-git-info "^2.8.9"
+    hosted-git-info "^2.1.5"
     semver "^5.1.0"
 
 npm-run-path@^2.0.0:
@@ -5895,6 +5915,11 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
+querystring@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.1.tgz#40d77615bb09d16902a85c3e38aa8b5ed761c2dd"
+  integrity sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==
+
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"