Fix an issue where the caspar plugin didn't parse enum data properly

Signed-off-by: Axel Boberg <[email protected]>
svt · Feb 29, 2024 · 503d4ab · 503d4ab
1 parent 0bbbd05
commit 503d4ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/plugins/caspar/lib/AMCP.js b/plugins/caspar/lib/AMCP.js
@@ -2,6 +2,8 @@
 //
 // SPDX-License-Identifier: MIT
 
+const types = require('./types')
+
 /**
  * @typedef {{
  *   channel: Number | undefined,
@@ -33,7 +35,7 @@ function layerString (opts = {}) {
  * @returns { String }
  */
 function transitionString (opts = {}) {
-  return `${opts.transitionName || ''} ${opts.transitionDuration || '0'} ${(opts.transitionEasing || 'LINEAR')} ${(opts.transitionDirection || 'LEFT')}`.toUpperCase()
+  return `${types.TRANSITION_NAME_ENUM[opts.transitionName] || ''} ${opts.transitionDuration || '0'} ${(opts.transitionEasing || 'LINEAR')} ${(types.TRANSITION_DIRECTION_ENUM[opts.transitionDirection] || 'LEFT')}`.toUpperCase()
 }
 
 /**

diff --git a/plugins/caspar/lib/types.js b/plugins/caspar/lib/types.js
@@ -4,6 +4,12 @@
 
 const bridge = require('bridge')
 
+const TRANSITION_NAME_ENUM = ['Cut', 'Mix', 'Push', 'Slide', 'Wipe']
+exports.TRANSITION_NAME_ENUM = TRANSITION_NAME_ENUM
+
+const TRANSITION_DIRECTION_ENUM = ['Left', 'Right']
+exports.TRANSITION_DIRECTION_ENUM = TRANSITION_DIRECTION_ENUM
+
 function init (htmlPath) {
   bridge.types.registerType({
     id: 'bridge.caspar.amcp',
@@ -100,14 +106,15 @@ function init (htmlPath) {
       'caspar.transitionName': {
         name: 'Transition',
         type: 'enum',
-        enum: ['Cut', 'Mix', 'Push', 'Slide', 'Wipe'],
+        enum: TRANSITION_NAME_ENUM,
+        default: '0',
         'ui.group': 'Transition'
       },
       'caspar.transitionDirection': {
         name: 'Direction',
         type: 'enum',
-        enum: ['Left', 'Right'],
-        default: 'Left',
+        enum: TRANSITION_DIRECTION_ENUM,
+        default: '0',
         'ui.group': 'Transition'
       },
       'caspar.transitionDuration': {