feat: Offtube soundbeds

tv2 · Mar 12, 2021 · b4ce593 · b4ce593
1 parent aa0acc3
commit b4ce593
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/src/tv2-common/cues/lyd.ts b/src/tv2-common/cues/lyd.ts
@@ -131,7 +131,7 @@ function LydContent(
 					deviceType: TSR.DeviceType.CASPARCG,
 					type: TSR.TimelineContentTypeCasparCg.MEDIA,
 					file,
-					channelLayout: 'bed',
+					channelLayout: 'stereo',
 					loop: true,
 					noStarttime: true,
 					mixer: {
@@ -171,10 +171,10 @@ function LydContent(
 	})
 }
 
-export function CreateLYDBaseline(): TSR.TSRTimelineObj[] {
+export function CreateLYDBaseline(studio: string): TSR.TSRTimelineObj[] {
 	return [
 		literal<TSR.TimelineObjAbstractAny>({
-			id: 'lyd_baseline',
+			id: `${studio}_lyd_baseline`,
 			enable: {
 				while: `!.${ControlClasses.LYDOnAir}`
 			},
@@ -188,7 +188,7 @@ export function CreateLYDBaseline(): TSR.TSRTimelineObj[] {
 		literal<TSR.TimelineObjCCGMedia>({
 			id: '',
 			// Q: Why start 10s? A: It needs to be longer than the longest fade out, a 10s fade out is probably more than we will ever use.
-			enable: { start: '#lyd_baseline.start + 10000', end: `.${ControlClasses.LYDOnAir}` },
+			enable: { start: `#${studio}_lyd_baseline.start + 10000`, end: `.${ControlClasses.LYDOnAir}` },
 			priority: 0,
 			layer: SharedCasparLLayer.CasparCGLYD,
 			content: {

diff --git a/src/tv2-common/helpers/graphics/internal/index.ts b/src/tv2-common/helpers/graphics/internal/index.ts
@@ -73,7 +73,7 @@ export function CreateInternalGraphic(
 			const adLibPiece = literal<IBlueprintAdLibPiece>({
 				_rank: rank || 0,
 				externalId: partId,
-				name: `${name}_fuck`,
+				name,
 				uniquenessId: `gfx_${name}_${sourceLayerId}_${outputLayerId}_commentator`,
 				sourceLayerId,
 				outputLayerId: SharedOutputLayers.OVERLAY,

diff --git a/src/tv2_afvd_showstyle/getRundown.ts b/src/tv2_afvd_showstyle/getRundown.ts
@@ -1296,7 +1296,7 @@ function getBaseline(config: BlueprintConfig): TSR.TSRTimelineObjBase[] {
 			}
 		}),
 
-		...CreateLYDBaseline(),
+		...CreateLYDBaseline('afvd'),
 
 		...(config.showStyle.CasparCGLoadingClip && config.showStyle.CasparCGLoadingClip.length
 			? [...config.mediaPlayers.map(mp => CasparPlayerClipLoadingLoop(mp.id))].map(layer => {

diff --git a/src/tv2_afvd_showstyle/helpers/config.ts b/src/tv2_afvd_showstyle/helpers/config.ts
@@ -9,7 +9,6 @@ export interface BlueprintConfig extends BlueprintConfigBase {
 
 export interface ShowStyleConfig extends TV2ShowstyleBlueprintConfigBase {
 	WipesConfig: TableConfigItemValue
-	LYDConfig: TableConfigItemValue
 }
 
 /*

diff --git a/src/tv2_offtube_showstyle/getRundown.ts b/src/tv2_offtube_showstyle/getRundown.ts
@@ -884,7 +884,7 @@ function getBaseline(config: OfftubeShowstyleBlueprintConfig): TSR.TSRTimelineOb
 			}
 		}),
 
-		...CreateLYDBaseline(),
+		...CreateLYDBaseline('offtube'),
 
 		...(config.showStyle.CasparCGLoadingClip && config.showStyle.CasparCGLoadingClip.length
 			? [...config.mediaPlayers.map(mp => CasparPlayerClipLoadingLoop(mp.id))].map(layer => {

diff --git a/src/tv2_offtube_studio/migrations/mappings-defaults.ts b/src/tv2_offtube_studio/migrations/mappings-defaults.ts
@@ -323,7 +323,7 @@ export default literal<BlueprintMappings>({
 	}),
 	casparcg_audio_lyd: literal<TSR.MappingCasparCG & BlueprintMapping>({
 		device: TSR.DeviceType.CASPARCG,
-		deviceId: 'caspar02',
+		deviceId: 'caspar01',
 		lookahead: LookaheadMode.NONE,
 		channel: 1,
 		layer: 101
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ export interface BlueprintConfig extends BlueprintConfigBase { @@
     export interface ShowStyleConfig extends TV2ShowstyleBlueprintConfigBase {
     	WipesConfig: TableConfigItemValue
-    	LYDConfig: TableConfigItemValue
     }
     /*
@@ Expand Down @@