Skip to content

Commit ad485e2

Browse files
committed
feat: add stylePresets support to tally
1 parent 946eaec commit ad485e2

File tree

4 files changed

+329
-39
lines changed

4 files changed

+329
-39
lines changed

packages/input-gateway/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@
7474
"dependencies": {
7575
"@esm2cjs/p-queue": "7.3.0",
7676
"@sofie-automation/input-manager": "0.4.0",
77-
"@sofie-automation/server-core-integration": "1.53.0-nightly-release53-20250702-092104-8eba5bc.0",
78-
"@sofie-automation/shared-lib": "1.53.0-nightly-release53-20250702-092104-8eba5bc.0",
77+
"@sofie-automation/server-core-integration": "1.53.0-nightly-release53-20251022-140953-e123abc.0",
78+
"@sofie-automation/shared-lib": "1.53.0-nightly-release53-20251022-140953-e123abc.0",
7979
"debug": "^4.3.4",
8080
"eventemitter3": "5.0.1",
8181
"p-all": "5.0.0",

packages/input-gateway/src/inputManagerHandler.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -647,8 +647,7 @@ export class InputManagerHandler {
647647
Tally.PRESENT |
648648
previewedAdlibs.reduce(
649649
(acc, adlib) =>
650-
// @ts-expect-error: needs new build of core-integration, but we're on release50, which causes some incompatibilities, even though things just work...
651-
acc | (adlib.isCurrent ? Tally.ACTIVE : Tally.NONE) | (adlib.isNext ? Tally.NEXT : Tally.NONE),
650+
acc | (adlib.isActive ? Tally.ACTIVE : Tally.NONE) | (adlib.isNext ? Tally.NEXT : Tally.NONE),
652651
Tally.NONE
653652
)
654653
contentLayerLongName = previewedAdlibs[0].sourceLayerName?.name

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,28 +278,24 @@ export class StreamDeckDeviceHandler {
278278
if (feedback.tally) {
279279
if (feedback.tally & Tally.ACTIVE) {
280280
stylePreset =
281-
stylePreset ||
282281
Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
283282
(preset) => preset.id === `${name}:active`
284-
)
283+
) || stylePreset
285284
} else if (feedback.tally & Tally.NEXT) {
286285
stylePreset =
287-
stylePreset ||
288286
Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
289287
(preset) => preset.id === `${name}:next`
290-
)
288+
) || stylePreset
291289
} else if (feedback.tally & Tally.OTHER) {
292290
stylePreset =
293-
stylePreset ||
294291
Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
295292
(preset) => preset.id === `${name}:other`
296-
)
293+
) || stylePreset
297294
} else if (feedback.tally & Tally.PRESENT) {
298295
stylePreset =
299-
stylePreset ||
300296
Object.values<StreamdeckStylePreset>(this.config.stylePresets).find(
301297
(preset) => preset.id === `${name}:present`
302-
)
298+
) || stylePreset
303299
}
304300
}
305301

0 commit comments

Comments
 (0)