Merge pull request #35 from Sofie-Automation/feat/tally

Author: jstarpl

packages/input-gateway/package.json

@@ -74,8 +74,8 @@
 	"dependencies": {
 		"@esm2cjs/p-queue": "7.3.0",
 		"@sofie-automation/input-manager": "0.4.0",
-		"@sofie-automation/server-core-integration": "1.53.0-nightly-release53-20250702-092104-8eba5bc.0",
-		"@sofie-automation/shared-lib": "1.53.0-nightly-release53-20250702-092104-8eba5bc.0",
+		"@sofie-automation/server-core-integration": "1.53.0-nightly-release53-20251022-140953-e123abc.0",
+		"@sofie-automation/shared-lib": "1.53.0-nightly-release53-20251022-140953-e123abc.0",
 		"debug": "^4.3.4",
 		"eventemitter3": "5.0.1",
 		"p-all": "5.0.0",

packages/input-gateway/src/inputManagerHandler.ts

@@ -647,8 +647,7 @@ export class InputManagerHandler {
 					Tally.PRESENT |
 					previewedAdlibs.reduce(
 						(acc, adlib) =>
-							// @ts-expect-error: needs new build of core-integration, but we're on release50, which causes some incompatibilities, even though things just work...
-							acc | (adlib.isCurrent ? Tally.ACTIVE : Tally.NONE) | (adlib.isNext ? Tally.NEXT : Tally.NONE),
+							acc | (adlib.isActive ? Tally.ACTIVE : Tally.NONE) | (adlib.isNext ? Tally.NEXT : Tally.NONE),
 						Tally.NONE
 					)
 				contentLayerLongName = previewedAdlibs[0].sourceLayerName?.name

packages/input-manager/src/integrations/streamdeck/device.ts

@@ -272,35 +272,33 @@ export class StreamDeckDeviceHandler {
 
 		// Find the first match
 		for (const name of styleClassNames) {
-			let stylePreset = Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
-				(preset) => preset.id === name
-			)
+			let stylePreset: StreamdeckStylePreset | undefined
 			if (feedback.tally) {
 				if (feedback.tally & Tally.ACTIVE) {
-					stylePreset =
-						stylePreset ||
-						Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
-							(preset) => preset.id === `${name}:active`
-						)
-				} else if (feedback.tally & Tally.NEXT) {
-					stylePreset =
-						stylePreset ||
-						Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
-							(preset) => preset.id === `${name}:next`
-						)
-				} else if (feedback.tally & Tally.OTHER) {
-					stylePreset =
-						stylePreset ||
-						Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
-							(preset) => preset.id === `${name}:other`
-						)
-				} else if (feedback.tally & Tally.PRESENT) {
-					stylePreset =
-						stylePreset ||
-						Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
-							(preset) => preset.id === `${name}:present`
-						)
+					stylePreset = Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
+						(preset) => preset.id === `${name}:active`
+					)
+				}
+				if (feedback.tally & Tally.NEXT && !stylePreset) {
+					stylePreset = Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
+						(preset) => preset.id === `${name}:next`
+					)
+				}
+				if (feedback.tally & Tally.OTHER && !stylePreset) {
+					stylePreset = Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
+						(preset) => preset.id === `${name}:other`
+					)
 				}
+				if (feedback.tally & Tally.PRESENT && !stylePreset) {
+					stylePreset = Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
+						(preset) => preset.id === `${name}:present`
+					)
+				}
+			}
+			if (!stylePreset) {
+				stylePreset = Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
+					(preset) => preset.id === name
+				)
 			}
 
 			if (stylePreset) {