fix: added bug-fixes from main (#84)

Eyevinn · Nov 7, 2024 · ab4b87b · ab4b87b
1 parent 700aa86
commit ab4b87b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/src/api/ateliereLive/pipelines/streams/streams.ts b/src/api/ateliereLive/pipelines/streams/streams.ts
@@ -269,7 +269,7 @@ export async function createStream(
         };
       }
       const updatedViewsForSource = viewsForSource.map((v) => {
-        return { ...v, label: source.name };
+        return { ...v, label: v.label || source.name };
       });
 
       const updatedViews = [

diff --git a/src/api/manager/job/syncInventory.ts b/src/api/manager/job/syncInventory.ts
@@ -140,7 +140,12 @@ export async function runSyncInventory() {
       audio_stream:
         apiSource.ingest_type === 'SRT' && apiSource.status === 'gone'
           ? inventorySource.audio_stream
-          : apiSource.audio_stream,
+          : {
+              number_of_channels: apiSource.audio_stream.number_of_channels,
+              sample_rate: apiSource.audio_stream.sample_rate,
+              audio_mapping:
+                inventorySource.audio_stream.audio_mapping || undefined
+            },
       // Add srt metadata if missing from SRT sources
       srt: updateSrtMetadata(inventorySource, apiSource)
     } satisfies WithId<Source>;

diff --git a/src/components/production/sources/ProductionSources.tsx b/src/components/production/sources/ProductionSources.tsx
@@ -214,7 +214,7 @@ const ProductionSources: React.FC<ProductionSourcesProps> = (props) => {
       const input: SourceReference = {
         _id: source._id.toString(),
         type: 'ingest_source',
-        label: source.ingest_source_name,
+        label: source.name || source.ingest_source_name,
         input_slot: firstEmptySlot(selectedSources)
       };
       addSource(input);

diff --git a/src/hooks/useMultiviewDefaultPresets.tsx b/src/hooks/useMultiviewDefaultPresets.tsx
@@ -43,7 +43,9 @@ export function useMultiviewDefaultPresets({
               return {
                 ...view,
                 label: sourceSlot >= 0 ? source.label : view.label,
-                id: sourceSlot >= 0 ? source._id : view.id
+                id: sourceSlot >= 0 ? source._id : view.id,
+                input_slot:
+                  sourceSlot >= 0 ? source.input_slot : view.input_slot
               };
             })
           }

diff --git a/src/hooks/useUpdateSourceInputSlotOnMultiviewLayouts.tsx b/src/hooks/useUpdateSourceInputSlotOnMultiviewLayouts.tsx
@@ -45,7 +45,10 @@ export function useUpdateSourceInputSlotOnMultiviewLayouts(): CallbackHook<
               )?.label;
 
               if ((view.id && view.id.length < 5) || preview || program) {
-                return view;
+                return {
+                  ...view,
+                  label: isUpdatedLabel || view.label
+                };
               } else if (isUpdatedInputSlot || isSameInputSlot) {
                 return {
                   ...view,