Merge pull request #202 from tv2/SOF-1421/revertUsesOfNewDatatype

Revert "SOF-1419 StudioMics now uses new datatype"
tv2 · Apr 17, 2023 · ca2344c · ca2344c
2 parents 692034c + 71c981c
commit ca2344c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 24 deletions.
diff --git a/src/tv2-common/blueprintConfig.ts b/src/tv2-common/blueprintConfig.ts
@@ -73,11 +73,6 @@ export interface ProcessedStudioConfig {
 	dsk: TableConfigItemDSK[]
 }
 
-export interface StudioMic {
-	label: string
-	value: string
-}
-
 export interface TV2StudioConfigBase {
 	MaximumPartDuration: number
 	DefaultPartDuration: number
@@ -125,7 +120,7 @@ export interface TV2StudioConfigBase {
 		Dip: number
 	}
 	AtemSettings: {}
-	StudioMics: StudioMic[]
+	StudioMics: string[]
 	SourcesRM: TableConfigItemSourceMappingWithSisyfos[]
 	SourcesFeed: TableConfigItemSourceMappingWithSisyfos[]
 	SourcesCam: TableConfigItemSourceMappingWithSisyfos[]

diff --git a/src/tv2-common/helpers/sisyfos.ts b/src/tv2-common/helpers/sisyfos.ts
@@ -124,9 +124,9 @@ function getStudioMicsTimelineObj(
 	timelineEnable: Timeline.TimelineEnable
 ): TSR.TimelineObjSisyfosChannels {
 	const studioMicsChannels: TSR.TimelineObjSisyfosChannels['content']['channels'] = []
-	config.studio.StudioMics.forEach((studioMic) => {
+	config.studio.StudioMics.forEach((layer) => {
 		studioMicsChannels.push({
-			mappedLayer: studioMic.value,
+			mappedLayer: layer,
 			isPgm: 1
 		})
 	})

diff --git a/src/tv2_afvd_showstyle/__tests__/configs.ts b/src/tv2_afvd_showstyle/__tests__/configs.ts
@@ -95,12 +95,12 @@ export const defaultStudioConfig: StudioConfig = {
 	SourcesFeed: prepareConfig('1:1,2:2,3:3,4:4,5:5,6:6,7:7,8:8,9:9,10:10', 'SourcesFeed', false, true),
 	SourcesReplay: prepareConfig('EVS 1:5,EVS 2:5,EPSIO:5', 'SourcesDelayedPlayback', false),
 	StudioMics: [
-		{ value: 'sisyfos_source_Host_1_st_a', label: 'Host1' },
-		{ value: 'sisyfos_source_Host_2_st_a', label: 'Host2' },
-		{ value: 'sisyfos_source_Guest_1_st_a', label: 'Guest1' },
-		{ value: 'sisyfos_source_Guest_2_st_a', label: 'Guest2' },
-		{ value: 'sisyfos_source_Guest_3_st_a', label: 'Guest3' },
-		{ value: 'sisyfos_source_Guest_4_st_a', label: 'Guest4' }
+		'sisyfos_source_Host_1_st_a',
+		'sisyfos_source_Host_2_st_a',
+		'sisyfos_source_Guest_1_st_a',
+		'sisyfos_source_Guest_2_st_a',
+		'sisyfos_source_Guest_3_st_a',
+		'sisyfos_source_Guest_4_st_a'
 	],
 	SwitcherSource: {
 		MixMinusDefault: 2,

diff --git a/src/tv2_afvd_showstyle/getRundown.ts b/src/tv2_afvd_showstyle/getRundown.ts
@@ -402,8 +402,8 @@ class GlobalAdLibPiecesGenerator {
 							content: {
 								deviceType: TSR.DeviceType.SISYFOS,
 								type: TSR.TimelineContentTypeSisyfos.CHANNELS,
-								channels: this.config.studio.StudioMics.map((studioMic) => ({
-									mappedLayer: studioMic.value,
+								channels: this.config.studio.StudioMics.map((layer) => ({
+									mappedLayer: layer,
 									isPgm: 1
 								})),
 								overridePriority: 10
@@ -431,8 +431,8 @@ class GlobalAdLibPiecesGenerator {
 							content: {
 								deviceType: TSR.DeviceType.SISYFOS,
 								type: TSR.TimelineContentTypeSisyfos.CHANNELS,
-								channels: this.config.studio.StudioMics.map((studioMic) => ({
-									mappedLayer: studioMic.value,
+								channels: this.config.studio.StudioMics.map((layer) => ({
+									mappedLayer: layer,
 									isPgm: 0
 								})),
 								overridePriority: 10

diff --git a/src/tv2_afvd_studio/helpers/config.ts b/src/tv2_afvd_studio/helpers/config.ts
@@ -1,7 +1,6 @@
 import { IBlueprintConfig, ICommonContext } from 'blueprints-integration'
 import {
 	ProcessedStudioConfig,
-	StudioMic,
 	TableConfigItemDSK,
 	TableConfigItemSourceMapping,
 	TableConfigItemSourceMappingWithSisyfos,
@@ -21,7 +20,7 @@ export interface StudioConfig extends TV2StudioConfigBase {
 	SourcesReplay: TableConfigItemSourceMappingWithSisyfos[]
 	ABMediaPlayers: TableConfigItemSourceMapping[]
 	ABPlaybackDebugLogging: boolean
-	StudioMics: StudioMic[]
+	StudioMics: string[]
 	SwitcherSource: {
 		SplitArtFill: number // Atem MP1 Fill
 		SplitArtKey: number // Atem MP1 Key

diff --git a/src/tv2_offtube_showstyle/getRundown.ts b/src/tv2_offtube_showstyle/getRundown.ts
@@ -127,8 +127,8 @@ function getGlobalAdLibPiecesOfftube(context: ShowStyleContext<OfftubeBlueprintC
 					content: {
 						deviceType: TSR.DeviceType.SISYFOS,
 						type: TSR.TimelineContentTypeSisyfos.CHANNELS,
-						channels: context.config.studio.StudioMics.map((studioMic) => ({
-							mappedLayer: studioMic.value,
+						channels: context.config.studio.StudioMics.map((layer) => ({
+							mappedLayer: layer,
 							isPgm: 1
 						})),
 						overridePriority: 10
@@ -157,8 +157,8 @@ function getGlobalAdLibPiecesOfftube(context: ShowStyleContext<OfftubeBlueprintC
 					content: {
 						deviceType: TSR.DeviceType.SISYFOS,
 						type: TSR.TimelineContentTypeSisyfos.CHANNELS,
-						channels: context.config.studio.StudioMics.map((studioMic) => ({
-							mappedLayer: studioMic.value,
+						channels: context.config.studio.StudioMics.map((layer) => ({
+							mappedLayer: layer,
 							isPgm: 0
 						})),
 						overridePriority: 10