feat: add support for tally-state pseudo-classes

Author: jstarpl

packages/input-gateway/src/inputManagerHandler.ts

@@ -648,7 +648,7 @@ export class InputManagerHandler {
 					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.CURRENT : Tally.NONE) | (adlib.isNext ? Tally.NEXT : Tally.NONE),
+							acc | (adlib.isCurrent ? Tally.ACTIVE : Tally.NONE) | (adlib.isNext ? Tally.NEXT : Tally.NONE),
 						Tally.NONE
 					)
 				contentLayerLongName = previewedAdlibs[0].sourceLayerName?.name

packages/input-manager/src/feedback/bitmap/typeRenderers/adlib/base.ts

@@ -55,8 +55,9 @@ const COLORS: Record<string, string> = {
 }
 
 const TALLY_COLORS: Record<string, string> = {
-	[Tally.CURRENT]: '#ff0000',
+	[Tally.ACTIVE]: '#ff0000',
 	[Tally.NEXT]: '#00ff00',
+	[Tally.OTHER]: '#ffff00',
 }
 
 export class BaseAdLibRenderer extends BaseRenderer {
@@ -69,8 +70,9 @@ export class BaseAdLibRenderer extends BaseRenderer {
 
 	private getTallyColor(tally: Tally | undefined): string | undefined {
 		if (tally === undefined) return undefined
-		if (Tally.CURRENT & tally) return TALLY_COLORS[Tally.CURRENT]
+		if (Tally.ACTIVE & tally) return TALLY_COLORS[Tally.ACTIVE]
 		if (Tally.NEXT & tally) return TALLY_COLORS[Tally.NEXT]
+		if (Tally.OTHER & tally) return TALLY_COLORS[Tally.OTHER]
 		return undefined
 	}
 

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

@@ -7,7 +7,7 @@ import { StreamDeckTcp } from '@elgato-stream-deck/tcp'
 import { Logger } from '../../logger'
 import { FeedbackStore } from '../../devices/feedbackStore'
 import { assertNever, DEFAULT_ANALOG_RATE_LIMIT, Symbols } from '../../lib'
-import { BitmapFeedback, Feedback, SomeFeedback } from '../../feedback/feedback'
+import { BitmapFeedback, Feedback, SomeFeedback, Tally } from '../../feedback/feedback'
 import { getBitmap } from '../../feedback/bitmap'
 import { StreamDeckDeviceOptions, StreamdeckStylePreset } from '../../generated'
 
@@ -272,9 +272,36 @@ export class StreamDeckDeviceHandler {
 
 		// Find the first match
 		for (const name of styleClassNames) {
-			const stylePreset = Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
+			let stylePreset = Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
 				(preset) => preset.id === name
 			)
+			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`
+						)
+				}
+			}
 
 			if (stylePreset) {
 				return {