From 3582ce18e12aae531a4e544a5907f502cbe32ccd Mon Sep 17 00:00:00 2001 From: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Date: Mon, 13 Dec 2021 21:50:44 +0100 Subject: [PATCH] Feat/studio clock (#61) * Studio Clock: broadcast change from integration --- server/src/classes/EventTimer.js | 4 +++- server/src/controllers/OscController.js | 8 ++++---- server/src/controllers/playbackController.js | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/server/src/classes/EventTimer.js b/server/src/classes/EventTimer.js index c7fc10943..2d2b16349 100644 --- a/server/src/classes/EventTimer.js +++ b/server/src/classes/EventTimer.js @@ -964,8 +964,10 @@ export class EventTimer extends Timer { * @description Set onAir property of timer * @param {boolean} onAir - whether flag is active */ - set onAir(onAir) { + setonAir(onAir) { this.onAir = onAir; + // broadcast change + this.broadcastThis('onAir', onAir); } start() { diff --git a/server/src/controllers/OscController.js b/server/src/controllers/OscController.js index 5eff71e31..45a6d715e 100644 --- a/server/src/controllers/OscController.js +++ b/server/src/controllers/OscController.js @@ -38,11 +38,11 @@ export const initiateOSC = (config) => { // get second part (command) switch (path.toLowerCase()) { - case 'onAir': - global.timer.onAir = true; + case 'onair': + global.timer.setonAir(true); break; - case 'offAir': - global.timer.onAir = false; + case 'offair': + global.timer.setonAir(false); break; case 'start': case 'play': diff --git a/server/src/controllers/playbackController.js b/server/src/controllers/playbackController.js index 0e2477878..0a5aca215 100644 --- a/server/src/controllers/playbackController.js +++ b/server/src/controllers/playbackController.js @@ -8,7 +8,7 @@ export const pbGet = async (req, res) => { // Turns onAir flag to true export const onAir = async (req, res) => { console.log('Setting onAir to true'); - global.timer.onAir = true; + global.timer.setonAir(true); res.sendStatus(200); }; @@ -16,7 +16,7 @@ export const onAir = async (req, res) => { // Turns onAir flag to true export const offAir = async (req, res) => { console.log('Setting onAir to false'); - global.timer.onAir = false; + global.timer.setonAir(false); res.sendStatus(200); };