Merge branch 'pr/ianshade/25' into develop

Author: jstarpl

packages/input-gateway/src/inputManagerHandler.ts

@@ -642,7 +642,15 @@ export class InputManagerHandler {
 				.reverse()
 
 			if (previewedAdlibs.length > 0) {
-				tally = tally | Tally.PRESENT
+				tally =
+					tally |
+					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.CURRENT : Tally.NONE) | (adlib.isNext ? Tally.NEXT : Tally.NONE),
+						Tally.NONE
+					)
 				contentLayerLongName = previewedAdlibs[0].sourceLayerName?.name
 				contentLayerShortName = previewedAdlibs[0].sourceLayerName?.abbreviation
 				contentLabel = previewedAdlibs.map((adlib) => InputManagerHandler.getStringLabel(adlib.label)).join(', ')

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

@@ -1,4 +1,4 @@
-import { ClassNames, BitmapFeedback } from '../../../feedback'
+import { ClassNames, BitmapFeedback, Tally } from '../../../feedback'
 import { BaseRenderer } from '../base'
 
 /**
@@ -54,6 +54,11 @@ const COLORS: Record<string, string> = {
 	[ClassNames.UNKNOWN]: '#4b4b4b',
 }
 
+const TALLY_COLORS: Record<string, string> = {
+	[Tally.CURRENT]: '#ff0000',
+	[Tally.NEXT]: '#00ff00',
+}
+
 export class BaseAdLibRenderer extends BaseRenderer {
 	private getAdLibColor(classNames: string[] | undefined): string {
 		if (classNames === undefined) return COLORS[ClassNames.UNKNOWN]
@@ -62,6 +67,13 @@ export class BaseAdLibRenderer extends BaseRenderer {
 		return COLORS[ClassNames.UNKNOWN]
 	}
 
+	private getTallyColor(tally: Tally | undefined): string | undefined {
+		if (tally === undefined) return undefined
+		if (Tally.CURRENT & tally) return TALLY_COLORS[Tally.CURRENT]
+		if (Tally.NEXT & tally) return TALLY_COLORS[Tally.NEXT]
+		return undefined
+	}
+
 	private getFontSize(label: string): number {
 		if (label.length <= 3) {
 			return 2.5
@@ -86,7 +98,7 @@ export class BaseAdLibRenderer extends BaseRenderer {
 			spring: true,
 			fontSize: this.percentToPixels(this.getFontSize(label)),
 			lineHeight: this.percentToPixels(this.getFontSize(label)),
-			background: this.getAdLibColor(feedback.classNames),
+			background: this.getTallyColor(feedback.tally) ?? this.getAdLibColor(feedback.classNames),
 			textShadowOffset: 1,
 			lineClamp: 4,
 		})