Show audio markers on load, send cue set to server.

Author: mstratford

.gitignore

@@ -32,4 +32,5 @@ venv/
 
 serverconfig.ini
 
-.idea/
+.idea/
+.vscode/settings.json

src/api.ts

@@ -258,6 +258,7 @@ export function loadPlaylistLibrary(libraryId: string): Promise<Track[]> {
   //return myradioApiRequest("/playlist/" + libraryId + "/tracks", "GET", {});
 }
 
+/*
 export function setTimeslotItemCue(
   timeslotItemId: string,
   secs: number
@@ -278,6 +279,7 @@ export function setTrackOutro(trackId: number, secs: number): Promise<null> {
     duration: secs,
   });
 }
+*/
 
 export type UpdateOp =
   | {

src/bapsicle.ts

@@ -145,7 +145,9 @@ export const bapsicleMiddleware: Middleware<{}, RootState, Dispatch<any>> = (
 
 export function sendBAPSicleChannel(message: any): void {
   if (BAPSicleWS) {
-    BAPSicleWS.send(JSON.stringify(message));
+    message = JSON.stringify(message);
+    console.log("Sending message to BAPSicle:", message);
+    BAPSicleWS.send(message);
   }
 }
 

src/mixer/state.ts

@@ -376,7 +376,21 @@ export const load = (
       dispatch(mixerState.actions.itemLoadComplete({ player }));
     });
 
+    // Add the audio marker regions
+    const state = getState().mixer.players[player];
+
     // TODO: This needs to happen without wavesurfer
+
+    if (state.loadedItem && "intro" in state.loadedItem) {
+      playerInstance.setIntro(state.loadedItem.intro);
+    }
+    if (state.loadedItem && "cue" in state.loadedItem) {
+      playerInstance.setCue(state.loadedItem.cue);
+      playerInstance.setCurrentTime(state.loadedItem.cue);
+    }
+    if (state.loadedItem && "outro" in state.loadedItem) {
+      playerInstance.setOutro(state.loadedItem.outro);
+    }
     playerInstance.on("timeChangeSeek", (time) => {
       if (Math.abs(time - getState().mixer.players[player].timeCurrent) > 0.5) {
         sendBAPSicleChannel({ channel: player, command: "SEEK", time: time });

src/showplanner/Player.tsx

@@ -16,6 +16,7 @@ import * as ShowPlanState from "../showplanner/state";
 import { HHMMTosec, secToHHMM, timestampToHHMM } from "../lib/utils";
 import * as api from "../api";
 import { AppThunk } from "../store";
+import { sendBAPSicleChannel } from "../bapsicle";
 
 export const USE_REAL_GAIN_VALUE = false;
 
@@ -96,15 +97,28 @@ const setTrackCue = (
   secs: number,
   player: number
 ): AppThunk => async (dispatch, getState) => {
-  try {
-    // Api only deals with whole seconds.
-    secs = Math.round(secs);
-    dispatch(MixerState.setLoadedItemCue(player, secs));
-    dispatch(ShowPlanState.setItemTimings({ item, cue: secs }));
-  } catch (e) {
-    dispatch(ShowPlanState.planSaveError("Failed saving track cue."));
-    console.error("Failed to set track cue: " + e);
-  }
+  console.log("Setting Cue to " + secs);
+  let marker = {
+    name: "Cue",
+    time: secs,
+    position: "mid",
+    section: null,
+  };
+  sendBAPSicleChannel({
+    channel: player,
+    command: "SETMARKER",
+    timeslotitemid: item.timeslotitemid,
+    marker: marker,
+  });
+  //try {
+  // Api only deals with whole seconds.
+  //secs = Math.round(secs);
+  //dispatch(MixerState.setLoadedItemCue(player, secs));
+  //dispatch(ShowPlanState.setItemTimings({ item, cue: secs }));
+  //} catch (e) {
+  //dispatch(ShowPlanState.planSaveError("Failed saving track cue."));
+  //console.error("Failed to set track cue: " + e);
+  //}
 };
 
 function TimingButtons({ id }: { id: number }) {