From 522eb74dc6b2faf048110fce6905f2e7d65219a5 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Mon, 11 Mar 2024 14:36:45 +0100 Subject: [PATCH 1/8] feat: Adds content data for graphic template into metadata so we wont have to introduce the content property in frontend --- src/tv2-common/helpers/graphics/internal/InternalGraphic.ts | 3 ++- src/tv2-common/onTimelineGenerate.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tv2-common/helpers/graphics/internal/InternalGraphic.ts b/src/tv2-common/helpers/graphics/internal/InternalGraphic.ts index aadf7897..4632bdb1 100644 --- a/src/tv2-common/helpers/graphics/internal/InternalGraphic.ts +++ b/src/tv2-common/helpers/graphics/internal/InternalGraphic.ts @@ -108,7 +108,8 @@ export abstract class InternalGraphic extends Graphic { type: Tv2PieceType.GRAPHICS, outputLayer: Tv2OutputLayer.OVERLAY, partType: this.partDefinition?.type, - pieceExternalId: this.partDefinition?.externalId + pieceExternalId: this.partDefinition?.externalId, + graphicTemplateName: this.templateName } } } diff --git a/src/tv2-common/onTimelineGenerate.ts b/src/tv2-common/onTimelineGenerate.ts index 0dd17daf..2ca2ed67 100644 --- a/src/tv2-common/onTimelineGenerate.ts +++ b/src/tv2-common/onTimelineGenerate.ts @@ -73,6 +73,7 @@ export interface PieceMetaData { export interface GraphicPieceMetaData extends PieceMetaData { partType?: PartType pieceExternalId?: string + graphicTemplateName?: string } export interface JinglePieceMetaData extends PieceMetaData { From a6b7fd2d97ab4d730f656b53fb36a27409f78788 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Mon, 11 Mar 2024 14:48:22 +0100 Subject: [PATCH 2/8] fix: Fixes failings tests --- .../helpers/pieces/__tests__/grafikViz.spec.ts | 12 ++++++++---- .../helpers/pieces/__tests__/telefon.spec.ts | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/tv2_afvd_showstyle/helpers/pieces/__tests__/grafikViz.spec.ts b/src/tv2_afvd_showstyle/helpers/pieces/__tests__/grafikViz.spec.ts index 5c1174e0..033e202e 100644 --- a/src/tv2_afvd_showstyle/helpers/pieces/__tests__/grafikViz.spec.ts +++ b/src/tv2_afvd_showstyle/helpers/pieces/__tests__/grafikViz.spec.ts @@ -123,7 +123,8 @@ describe('grafik piece', () => { type: Tv2PieceType.GRAPHICS, outputLayer: Tv2OutputLayer.OVERLAY, partType: PartType.Kam, - pieceExternalId: dummyPart.externalId + pieceExternalId: dummyPart.externalId, + graphicTemplateName: 'bund' }, outputLayerId: SharedOutputLayer.OVERLAY, sourceLayerId: SourceLayer.PgmGraphicsLower, @@ -400,7 +401,8 @@ describe('grafik piece', () => { type: Tv2PieceType.GRAPHICS, outputLayer: Tv2OutputLayer.OVERLAY, partType: PartType.Kam, - pieceExternalId: dummyPart.externalId + pieceExternalId: dummyPart.externalId, + graphicTemplateName: 'bund' }, outputLayerId: SharedOutputLayer.OVERLAY, sourceLayerId: SourceLayer.PgmGraphicsLower, @@ -550,7 +552,8 @@ describe('grafik piece', () => { type: Tv2PieceType.GRAPHICS, outputLayer: Tv2OutputLayer.OVERLAY, partType: PartType.Kam, - pieceExternalId: dummyPart.externalId + pieceExternalId: dummyPart.externalId, + graphicTemplateName: 'direkte' }, outputLayerId: SharedOutputLayer.OVERLAY, sourceLayerId: SourceLayer.PgmGraphicsIdent, @@ -619,7 +622,8 @@ describe('grafik piece', () => { type: Tv2PieceType.GRAPHICS, outputLayer: Tv2OutputLayer.OVERLAY, partType: PartType.Kam, - pieceExternalId: dummyPart.externalId + pieceExternalId: dummyPart.externalId, + graphicTemplateName: 'arkiv' }, outputLayerId: SharedOutputLayer.OVERLAY, sourceLayerId: SourceLayer.PgmGraphicsIdent, diff --git a/src/tv2_afvd_showstyle/helpers/pieces/__tests__/telefon.spec.ts b/src/tv2_afvd_showstyle/helpers/pieces/__tests__/telefon.spec.ts index a46ffd38..e10e55ce 100644 --- a/src/tv2_afvd_showstyle/helpers/pieces/__tests__/telefon.spec.ts +++ b/src/tv2_afvd_showstyle/helpers/pieces/__tests__/telefon.spec.ts @@ -76,7 +76,8 @@ describe('telefon', () => { type: Tv2PieceType.GRAPHICS, outputLayer: Tv2OutputLayer.OVERLAY, partType: PartType.Kam, - pieceExternalId: dummyPart.externalId + pieceExternalId: dummyPart.externalId, + graphicTemplateName: 'bund' }, content: literal>({ fileName: 'bund', From 06e1efd0cea02c49891bab61f0217d068c53c27f Mon Sep 17 00:00:00 2001 From: Rasmus Lindved Date: Tue, 12 Mar 2024 15:07:30 +0100 Subject: [PATCH 3/8] SOF-1823 Set proper default values for casparcg_player_clip_pending layerMapping --- src/tv2_afvd_studio/migrations/mappings-defaults.ts | 4 ++-- src/tv2_offtube_studio/migrations/mappings-defaults.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tv2_afvd_studio/migrations/mappings-defaults.ts b/src/tv2_afvd_studio/migrations/mappings-defaults.ts index fd946686..09fdaa96 100644 --- a/src/tv2_afvd_studio/migrations/mappings-defaults.ts +++ b/src/tv2_afvd_studio/migrations/mappings-defaults.ts @@ -395,8 +395,8 @@ export const MAPPINGS_CASPAR: BlueprintMappings = { device: TSR.DeviceType.ABSTRACT, deviceId: 'abstract0', lookahead: LookaheadMode.PRELOAD, - lookaheadDepth: 1, - lookaheadMaxSearchDistance: -1 + lookaheadDepth: 2, + lookaheadMaxSearchDistance: 10 }), [CasparPlayerClip(1)]: literal({ device: TSR.DeviceType.CASPARCG, diff --git a/src/tv2_offtube_studio/migrations/mappings-defaults.ts b/src/tv2_offtube_studio/migrations/mappings-defaults.ts index 1c605eb8..71596e49 100644 --- a/src/tv2_offtube_studio/migrations/mappings-defaults.ts +++ b/src/tv2_offtube_studio/migrations/mappings-defaults.ts @@ -218,7 +218,7 @@ const MAPPINGS_CASPAR: BlueprintMappings = { deviceId: 'abstract0', lookahead: LookaheadMode.PRELOAD, lookaheadDepth: 1, - lookaheadMaxSearchDistance: 1 + lookaheadMaxSearchDistance: 5 }), [CasparPlayerClip(1)]: literal({ device: TSR.DeviceType.CASPARCG, From 3298828c53a4df42f73f3f2c97bbfe1c223e24a4 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Wed, 13 Mar 2024 07:16:05 +0100 Subject: [PATCH 4/8] fix: Adds s to graphicTemplate --- .../helpers/graphics/internal/InternalGraphic.ts | 2 +- src/tv2-common/onTimelineGenerate.ts | 2 +- .../helpers/pieces/__tests__/grafikViz.spec.ts | 8 ++++---- .../helpers/pieces/__tests__/telefon.spec.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/tv2-common/helpers/graphics/internal/InternalGraphic.ts b/src/tv2-common/helpers/graphics/internal/InternalGraphic.ts index 4632bdb1..d575ab28 100644 --- a/src/tv2-common/helpers/graphics/internal/InternalGraphic.ts +++ b/src/tv2-common/helpers/graphics/internal/InternalGraphic.ts @@ -109,7 +109,7 @@ export abstract class InternalGraphic extends Graphic { outputLayer: Tv2OutputLayer.OVERLAY, partType: this.partDefinition?.type, pieceExternalId: this.partDefinition?.externalId, - graphicTemplateName: this.templateName + graphicsTemplateName: this.templateName } } } diff --git a/src/tv2-common/onTimelineGenerate.ts b/src/tv2-common/onTimelineGenerate.ts index 2ca2ed67..93e8b1c5 100644 --- a/src/tv2-common/onTimelineGenerate.ts +++ b/src/tv2-common/onTimelineGenerate.ts @@ -73,7 +73,7 @@ export interface PieceMetaData { export interface GraphicPieceMetaData extends PieceMetaData { partType?: PartType pieceExternalId?: string - graphicTemplateName?: string + graphicsTemplateName?: string } export interface JinglePieceMetaData extends PieceMetaData { diff --git a/src/tv2_afvd_showstyle/helpers/pieces/__tests__/grafikViz.spec.ts b/src/tv2_afvd_showstyle/helpers/pieces/__tests__/grafikViz.spec.ts index 033e202e..8c3e5181 100644 --- a/src/tv2_afvd_showstyle/helpers/pieces/__tests__/grafikViz.spec.ts +++ b/src/tv2_afvd_showstyle/helpers/pieces/__tests__/grafikViz.spec.ts @@ -124,7 +124,7 @@ describe('grafik piece', () => { outputLayer: Tv2OutputLayer.OVERLAY, partType: PartType.Kam, pieceExternalId: dummyPart.externalId, - graphicTemplateName: 'bund' + graphicsTemplateName: 'bund' }, outputLayerId: SharedOutputLayer.OVERLAY, sourceLayerId: SourceLayer.PgmGraphicsLower, @@ -402,7 +402,7 @@ describe('grafik piece', () => { outputLayer: Tv2OutputLayer.OVERLAY, partType: PartType.Kam, pieceExternalId: dummyPart.externalId, - graphicTemplateName: 'bund' + graphicsTemplateName: 'bund' }, outputLayerId: SharedOutputLayer.OVERLAY, sourceLayerId: SourceLayer.PgmGraphicsLower, @@ -553,7 +553,7 @@ describe('grafik piece', () => { outputLayer: Tv2OutputLayer.OVERLAY, partType: PartType.Kam, pieceExternalId: dummyPart.externalId, - graphicTemplateName: 'direkte' + graphicsTemplateName: 'direkte' }, outputLayerId: SharedOutputLayer.OVERLAY, sourceLayerId: SourceLayer.PgmGraphicsIdent, @@ -623,7 +623,7 @@ describe('grafik piece', () => { outputLayer: Tv2OutputLayer.OVERLAY, partType: PartType.Kam, pieceExternalId: dummyPart.externalId, - graphicTemplateName: 'arkiv' + graphicsTemplateName: 'arkiv' }, outputLayerId: SharedOutputLayer.OVERLAY, sourceLayerId: SourceLayer.PgmGraphicsIdent, diff --git a/src/tv2_afvd_showstyle/helpers/pieces/__tests__/telefon.spec.ts b/src/tv2_afvd_showstyle/helpers/pieces/__tests__/telefon.spec.ts index e10e55ce..769e30e5 100644 --- a/src/tv2_afvd_showstyle/helpers/pieces/__tests__/telefon.spec.ts +++ b/src/tv2_afvd_showstyle/helpers/pieces/__tests__/telefon.spec.ts @@ -77,7 +77,7 @@ describe('telefon', () => { outputLayer: Tv2OutputLayer.OVERLAY, partType: PartType.Kam, pieceExternalId: dummyPart.externalId, - graphicTemplateName: 'bund' + graphicsTemplateName: 'bund' }, content: literal>({ fileName: 'bund', From 21e57b80abe8cf01563d76821a3070b8ecc2be83 Mon Sep 17 00:00:00 2001 From: Rasmus Lindved Date: Wed, 13 Mar 2024 12:25:35 +0100 Subject: [PATCH 5/8] SOF-1824 Add 1/2 audio track to ingested EVS --- .../inewsConversion/converters/ParseBody.ts | 4 +-- .../converters/__tests__/body-parser.spec.ts | 30 +++++++++---------- src/tv2_afvd_showstyle/__tests__/configs.ts | 6 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/tv2-common/inewsConversion/converters/ParseBody.ts b/src/tv2-common/inewsConversion/converters/ParseBody.ts index 8e8b6aa6..f445deab 100644 --- a/src/tv2-common/inewsConversion/converters/ParseBody.ts +++ b/src/tv2-common/inewsConversion/converters/ParseBody.ts @@ -675,7 +675,7 @@ export function getSourceDefinition(typeStr: string): SourceDefinition | undefin } } else if (EVS_RED_TEXT.test(typeStr)) { const strippedToken = typeStr.match(EVS_RED_TEXT) - const id = `EVS ${strippedToken![1].toUpperCase()}` + const id = `EVS ${strippedToken![1].toUpperCase()} 1/2` const vo = strippedToken![2] return { sourceType: SourceType.REPLAY, @@ -687,7 +687,7 @@ export function getSourceDefinition(typeStr: string): SourceDefinition | undefin } else if (/EPSIO/i.test(typeStr)) { return { sourceType: SourceType.REPLAY, - id: 'EPSIO', + id: 'EPSIO 1/2', vo: true, raw: typeStr, name: 'EPSIO' diff --git a/src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts b/src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts index 235204c0..436b6ccd 100644 --- a/src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts +++ b/src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts @@ -1514,8 +1514,8 @@ describe('Body parser', () => { rawType: 'EVS 1', sourceDefinition: { sourceType: SourceType.REPLAY, - id: 'EVS 1', - name: 'EVS 1', + id: 'EVS 1 1/2', + name: 'EVS 1 1/2', raw: 'EVS 1', vo: false }, @@ -1541,8 +1541,8 @@ describe('Body parser', () => { rawType: 'EVS1VOV', sourceDefinition: { sourceType: SourceType.REPLAY, - id: 'EVS 1', - name: 'EVS 1 VOV', + id: 'EVS 1 1/2', + name: 'EVS 1 1/2 VOV', raw: 'EVS1VOV', vo: true }, @@ -1567,8 +1567,8 @@ describe('Body parser', () => { rawType: 'EVS 1 VO', sourceDefinition: { sourceType: SourceType.REPLAY, - id: 'EVS 1', - name: 'EVS 1 VO', + id: 'EVS 1 1/2', + name: 'EVS 1 1/2 VO', raw: 'EVS 1 VO', vo: true }, @@ -1585,8 +1585,8 @@ describe('Body parser', () => { rawType: 'EVS 2VO', sourceDefinition: { sourceType: SourceType.REPLAY, - id: 'EVS 2', - name: 'EVS 2 VO', + id: 'EVS 2 1/2', + name: 'EVS 2 1/2 VO', raw: 'EVS 2VO', vo: true }, @@ -1603,8 +1603,8 @@ describe('Body parser', () => { rawType: 'EVS3VO', sourceDefinition: { sourceType: SourceType.REPLAY, - id: 'EVS 3', - name: 'EVS 3 VO', + id: 'EVS 3 1/2', + name: 'EVS 3 1/2 VO', raw: 'EVS3VO', vo: true }, @@ -1621,8 +1621,8 @@ describe('Body parser', () => { rawType: 'EVS4 VO', sourceDefinition: { sourceType: SourceType.REPLAY, - id: 'EVS 4', - name: 'EVS 4 VO', + id: 'EVS 4 1/2', + name: 'EVS 4 1/2 VO', raw: 'EVS4 VO', vo: true }, @@ -2564,7 +2564,7 @@ describe('Body parser', () => { routing: { type: CueType.Routing, target: 'WALL', - INP1: { sourceType: SourceType.REPLAY, name: 'EVS 1', id: 'EVS 1', raw: 'EVS 1', vo: false }, + INP1: { sourceType: SourceType.REPLAY, name: 'EVS 1 1/2', id: 'EVS 1 1/2', raw: 'EVS 1', vo: false }, iNewsCommand: '' }, graphic: { @@ -2603,8 +2603,8 @@ describe('Body parser', () => { rawType: 'EVS 1', sourceDefinition: { sourceType: SourceType.REPLAY, - id: 'EVS 1', - name: 'EVS 1', + id: 'EVS 1 1/2', + name: 'EVS 1 1/2', raw: 'EVS 1', vo: false }, diff --git a/src/tv2_afvd_showstyle/__tests__/configs.ts b/src/tv2_afvd_showstyle/__tests__/configs.ts index 6c4d544c..fa9b5584 100644 --- a/src/tv2_afvd_showstyle/__tests__/configs.ts +++ b/src/tv2_afvd_showstyle/__tests__/configs.ts @@ -138,9 +138,9 @@ export const defaultStudioConfig: StudioConfig = { ), SourcesReplay: prepareConfig( [ - { id: 'EVS 1', switcherSource: 5, sisyfosLayers: ['sisyfos_source_evs_1_audio_1_2'] }, - { id: 'EVS 2', switcherSource: 5, sisyfosLayers: ['sisyfos_source_evs_2_audio_1_2'] }, - { id: 'EPSIO', switcherSource: 5, sisyfosLayers: ['sisyfos_source_epsio_audio_1_2'] } + { id: 'EVS 1 1/2', switcherSource: 5, sisyfosLayers: ['sisyfos_source_evs_1_audio_1_2'] }, + { id: 'EVS 2 1/2', switcherSource: 5, sisyfosLayers: ['sisyfos_source_evs_2_audio_1_2'] }, + { id: 'EPSIO 1/2', switcherSource: 5, sisyfosLayers: ['sisyfos_source_epsio_audio_1_2'] } ], 'SourcesDelayedPlayback', false From e9bb98d775ae29076505add56b8e0edcd27fd13c Mon Sep 17 00:00:00 2001 From: Rasmus Lindved Date: Wed, 13 Mar 2024 13:40:22 +0100 Subject: [PATCH 6/8] SOF-1789 Notify Core about error when CasparCgDesignValues has a whitespace in the name --- src/tv2-common/cues/gfx-schema-generator.ts | 24 ++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/src/tv2-common/cues/gfx-schema-generator.ts b/src/tv2-common/cues/gfx-schema-generator.ts index 75357a63..debec064 100644 --- a/src/tv2-common/cues/gfx-schema-generator.ts +++ b/src/tv2-common/cues/gfx-schema-generator.ts @@ -12,6 +12,11 @@ import { CueType, SharedGraphicLLayer, SharedOutputLayer, SharedSourceLayer } fr import { Tv2PieceType } from '../../tv2-constants/tv2-piece-type' import { DveLoopGenerator } from '../helpers/graphics/caspar/dve-loop-generator' +interface CasparCgDesignValues { + name: string + properties: unknown +} + const NON_BASELINE_SCHEMA: string = 'NON_BASELINE_SCHEMA' const VALID_EMPTY_SCHEMA_VALUE: string = 'N/A' @@ -19,6 +24,8 @@ export class GfxSchemaGenerator { constructor(private dveLoopGenerator: DveLoopGenerator) {} public createBaselineTimelineObjectsFromGfxDefaults(context: ShowStyleContext): TSR.TSRTimelineObjBase[] { + this.assertAllCasparCgDesignValues(context) + const schemaId: string = context.config.showStyle.GfxDefaults[0].DefaultSchema.value if (VALID_EMPTY_SCHEMA_VALUE === schemaId) { return [] @@ -32,7 +39,6 @@ export class GfxSchemaGenerator { ) return [] } - const cue: CueDefinitionGfxSchema = { type: CueType.GraphicSchema, schema: schema.VizTemplate, @@ -42,6 +48,22 @@ export class GfxSchemaGenerator { return this.createBaselineTimelineObjects(context, cue, 10) } + private assertAllCasparCgDesignValues(context: ShowStyleContext): void { + context.config.showStyle.GfxSchemaTemplates.forEach((schema) => { + if (!schema.CasparCgDesignValues) { + return + } + const casparCgDesignValues: CasparCgDesignValues[] = JSON.parse(schema.CasparCgDesignValues) + casparCgDesignValues.forEach((designValues) => { + if (designValues.name && designValues.name.includes(' ')) { + context.core.notifyUserError( + `Schema for ${schema.VizTemplate} has invalid CasparCgDesignValues. The Design ${designValues.name} has whitespace in it's name!` + ) + } + }) + }) + } + public createBlueprintPieceFromGfxSchemaCue( context: ShowStyleContext, pieces: IBlueprintPiece[], From ededde56fbe9818601f2fe52697c026057a083fa Mon Sep 17 00:00:00 2001 From: Rasmus Lindved Date: Tue, 19 Mar 2024 08:21:24 +0100 Subject: [PATCH 7/8] SOF-1824 Don't include the audioTrack in the name of EVS when ingesting from iNews --- .../inewsConversion/converters/ParseBody.ts | 9 +++++---- .../converters/__tests__/body-parser.spec.ts | 16 ++++++++-------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/tv2-common/inewsConversion/converters/ParseBody.ts b/src/tv2-common/inewsConversion/converters/ParseBody.ts index f445deab..b22125ef 100644 --- a/src/tv2-common/inewsConversion/converters/ParseBody.ts +++ b/src/tv2-common/inewsConversion/converters/ParseBody.ts @@ -675,14 +675,15 @@ export function getSourceDefinition(typeStr: string): SourceDefinition | undefin } } else if (EVS_RED_TEXT.test(typeStr)) { const strippedToken = typeStr.match(EVS_RED_TEXT) - const id = `EVS ${strippedToken![1].toUpperCase()} 1/2` - const vo = strippedToken![2] + const name: string = `EVS ${strippedToken![1].toUpperCase()}` + const audioTrack: string = '1/2' + const vo: string = strippedToken![2] return { sourceType: SourceType.REPLAY, - id, + id: `${name} ${audioTrack}`, vo: !!vo, raw: strippedToken![0].trim(), - name: `${id}${vo ? ' ' + vo : ''}` + name: `${name}${vo ? ' ' + vo : ''}` } } else if (/EPSIO/i.test(typeStr)) { return { diff --git a/src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts b/src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts index 436b6ccd..aea7e1af 100644 --- a/src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts +++ b/src/tv2-common/inewsConversion/converters/__tests__/body-parser.spec.ts @@ -1515,7 +1515,7 @@ describe('Body parser', () => { sourceDefinition: { sourceType: SourceType.REPLAY, id: 'EVS 1 1/2', - name: 'EVS 1 1/2', + name: 'EVS 1', raw: 'EVS 1', vo: false }, @@ -1542,7 +1542,7 @@ describe('Body parser', () => { sourceDefinition: { sourceType: SourceType.REPLAY, id: 'EVS 1 1/2', - name: 'EVS 1 1/2 VOV', + name: 'EVS 1 VOV', raw: 'EVS1VOV', vo: true }, @@ -1568,7 +1568,7 @@ describe('Body parser', () => { sourceDefinition: { sourceType: SourceType.REPLAY, id: 'EVS 1 1/2', - name: 'EVS 1 1/2 VO', + name: 'EVS 1 VO', raw: 'EVS 1 VO', vo: true }, @@ -1586,7 +1586,7 @@ describe('Body parser', () => { sourceDefinition: { sourceType: SourceType.REPLAY, id: 'EVS 2 1/2', - name: 'EVS 2 1/2 VO', + name: 'EVS 2 VO', raw: 'EVS 2VO', vo: true }, @@ -1604,7 +1604,7 @@ describe('Body parser', () => { sourceDefinition: { sourceType: SourceType.REPLAY, id: 'EVS 3 1/2', - name: 'EVS 3 1/2 VO', + name: 'EVS 3 VO', raw: 'EVS3VO', vo: true }, @@ -1622,7 +1622,7 @@ describe('Body parser', () => { sourceDefinition: { sourceType: SourceType.REPLAY, id: 'EVS 4 1/2', - name: 'EVS 4 1/2 VO', + name: 'EVS 4 VO', raw: 'EVS4 VO', vo: true }, @@ -2564,7 +2564,7 @@ describe('Body parser', () => { routing: { type: CueType.Routing, target: 'WALL', - INP1: { sourceType: SourceType.REPLAY, name: 'EVS 1 1/2', id: 'EVS 1 1/2', raw: 'EVS 1', vo: false }, + INP1: { sourceType: SourceType.REPLAY, name: 'EVS 1', id: 'EVS 1 1/2', raw: 'EVS 1', vo: false }, iNewsCommand: '' }, graphic: { @@ -2604,7 +2604,7 @@ describe('Body parser', () => { sourceDefinition: { sourceType: SourceType.REPLAY, id: 'EVS 1 1/2', - name: 'EVS 1 1/2', + name: 'EVS 1', raw: 'EVS 1', vo: false }, From 549cd826dcd094e377cf2386e53f05e5c1116f24 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Thu, 21 Mar 2024 10:52:11 +0100 Subject: [PATCH 8/8] fix: Removes output layer for selected servers and sets the piece type to unknown since we dont have a use for it in the GUI --- src/tv2-common/parts/server.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tv2-common/parts/server.ts b/src/tv2-common/parts/server.ts index 323086e5..7373c4b7 100644 --- a/src/tv2-common/parts/server.ts +++ b/src/tv2-common/parts/server.ts @@ -231,8 +231,7 @@ function getServerSelectionBlueprintPiece( sourceLayerId: layers.SourceLayer.SelectedServer, lifespan: PieceLifespan.WithinPart, metaData: { - type: Tv2PieceType.VIDEO_CLIP, - outputLayer: Tv2OutputLayer.PROGRAM, + type: Tv2PieceType.UNKNOWN, sourceName: contentServerElement.fileName, audioMode: layers.SourceLayer.SelectedServer === SharedSourceLayer.SelectedVoiceOver