Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/input-gateway/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
9 changes: 8 additions & 1 deletion packages/input-gateway/src/inputManagerHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,14 @@ export class InputManagerHandler {
.reverse()

if (previewedAdlibs.length > 0) {
tally = tally | Tally.PRESENT
tally =
tally |
Tally.PRESENT |
previewedAdlibs.reduce(
(acc, adlib) =>
acc | (adlib.isActive ? Tally.ACTIVE : 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(', ')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ClassNames, BitmapFeedback } from '../../../feedback'
import { ClassNames, BitmapFeedback, Tally } from '../../../feedback'
import { BaseRenderer } from '../base'

/**
Expand Down Expand Up @@ -54,6 +54,12 @@ const COLORS: Record<string, string> = {
[ClassNames.UNKNOWN]: '#4b4b4b',
}

const TALLY_COLORS: Record<string, string> = {
[Tally.ACTIVE]: '#ff0000',
[Tally.NEXT]: '#00ff00',
[Tally.OTHER]: '#ffff00',
}

export class BaseAdLibRenderer extends BaseRenderer {
private getAdLibColor(classNames: string[] | undefined): string {
if (classNames === undefined) return COLORS[ClassNames.UNKNOWN]
Expand All @@ -62,6 +68,14 @@ export class BaseAdLibRenderer extends BaseRenderer {
return COLORS[ClassNames.UNKNOWN]
}

private getTallyColor(tally: Tally | undefined): string | undefined {
if (tally === undefined) return undefined
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
}

private getFontSize(label: string): number {
if (label.length <= 3) {
return 2.5
Expand All @@ -86,7 +100,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,
})
Expand Down
33 changes: 29 additions & 4 deletions packages/input-manager/src/integrations/streamdeck/device.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -272,9 +272,34 @@ export class StreamDeckDeviceHandler {

// Find the first match
for (const name of styleClassNames) {
const 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 = 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) {
return {
Expand Down
Loading