diff --git a/instance/main.js b/instance/main.js index 180d07fb0e65bfe60224d851ea3370c7d610fe58..b7315ccc56f12992f72cc759ce1fb97b211e569a 100644 --- a/instance/main.js +++ b/instance/main.js @@ -175,14 +175,6 @@ ipcRenderer.on('reload-queue-responce', (event, arg) => { [].forEach.call(document.querySelectorAll('#panelRight .karaCard'), addQueueKaraEventHandlers); }); -ipcRenderer.on('send-lektord', (event, state) => { - setTimeout(() => ipcRenderer.send('reload-queue-request'), 1000); - setInterval(() => ipcRenderer.send('verify-queue-reloaded-request'), 50); - setInterval(() => ipcRenderer.send('get-song-time-data'), 50); - setInterval(() => ipcRenderer.send('get-runnings'), 10000); - setInterval(() => ipcRenderer.send('verify-state'), 50); -}); - ipcRenderer.on('send-state', (event, state) => updatePlayPauseButton(state)); ipcRenderer.on('send-song-time-data', (event, timeData) => { diff --git a/main.js b/main.js index 357ac08b9c0e0aa7857a6caa7e19956b130608ed..a47c9a151ee712a52ce1a0f627c947f8e929e72c 100644 --- a/main.js +++ b/main.js @@ -254,23 +254,6 @@ ipcMain.on('reload-db-request', (event, arg) => { } }); -/* Send the queue to the webpage when asked to */ -ipcMain.on('reload-queue-request', (event, arg) => { - logger.info('main', 'Reloading next karas in queue'); - db.queueAll().then(karas => { - event.reply('reload-queue-responce', karas); - }); -}); - -ipcMain.on('verify-queue-reloaded-request', (event, arg) => { - if (lkt.isQueueUpdated()) { - lkt.setQueueUpdated(false); - db.queueAll().then(karas => { - event.reply('reload-queue-responce', karas); - }); - } -}); - ipcMain.on('queue-moved-kara', (event, movement) => { if (movement.to != movement.from) { lkt.commandMove(movement.from, movement.to); @@ -297,59 +280,68 @@ ipcMain.on('add-kara-queue-pos', (event, addparams) => { lkt.commandQueueAddId(addparams.id).then(() => lkt.commandMove(addparams.queueSize + 1, addparams.position)); }); -ipcMain.on('verify-state', (event, arg) => { - if (lkt.isStatusUpdated()) { - event.reply('send-state', lkt.getStatus().state); - } -}); - ipcMain.on('verify-lektord', (event, arg) => { lkt.ping().then(sta => { logger.debug('main', `Status from ping is ${sta}`); lkt.reloadState(); setTimeout(() => lkt.idleActualisation(), 1000); setTimeout(() => lkt.statusActualisation(), 1500); - event.reply('send-lektord'); - }); -}); - -ipcMain.on('get-song-time-data', (event, arg) => { - var newSongTimeData = lkt.getSongTimeData(); - if (newSongTimeData.elapsed != songTimeData.elapsed || newSongTimeData.song != songTimeData.song) { - songTimeData = newSongTimeData; - event.reply('send-song-time-data', { - elapsed: songTimeData.elapsed, - total: songTimeData.total, - song: songTimeData.song, - state: songTimeData.state, - }); - counterTime = 0; - } else if (newSongTimeData.state == 'play') { - counterTime++; - event.reply('send-song-time-data', { - elapsed: songTimeData.elapsed + counterTime / 20.0, - total: songTimeData.total, - song: songTimeData.song, - state: songTimeData.state, - }); - } else { - event.reply('send-song-time-data', { - elapsed: songTimeData.elapsed + counterTime / 20.0, - total: songTimeData.total, - song: songTimeData.song, - state: songTimeData.state, - }); - } -}); -ipcMain.on('get-runnings', (event, arg) => { - isRunning({ win: 'klkt.exe', mac: 'klkt', linux: 'klkt' }).then(vklkt => { - isRunning({ win: 'lektord.exe', mac: 'lektord', linux: 'lektord' }).then(vlektord => { - event.reply('send-runnings', { - klkt: vklkt, - lektord: vlektord, + setTimeout(() => db.queueAll().then(karas => event.reply('reload-queue-responce', karas)), 1000); + setInterval(() => { + if (lkt.isQueueUpdated()) { + lkt.setQueueUpdated(false); + db.queueAll().then(karas => { + event.reply('reload-queue-responce', karas); + }); + } + }, 50); + + setInterval(() => { + var newSongTimeData = lkt.getSongTimeData(); + if (newSongTimeData.elapsed != songTimeData.elapsed || newSongTimeData.song != songTimeData.song) { + songTimeData = newSongTimeData; + event.reply('send-song-time-data', { + elapsed: songTimeData.elapsed, + total: songTimeData.total, + song: songTimeData.song, + state: songTimeData.state, + }); + counterTime = 0; + } else if (newSongTimeData.state == 'play') { + counterTime++; + event.reply('send-song-time-data', { + elapsed: songTimeData.elapsed + counterTime / 20.0, + total: songTimeData.total, + song: songTimeData.song, + state: songTimeData.state, + }); + } else { + event.reply('send-song-time-data', { + elapsed: songTimeData.elapsed + counterTime / 20.0, + total: songTimeData.total, + song: songTimeData.song, + state: songTimeData.state, + }); + } + }, 50); + + setInterval(() => { + isRunning({ win: 'klkt.exe', mac: 'klkt', linux: 'klkt' }).then(vklkt => { + isRunning({ win: 'lektord.exe', mac: 'lektord', linux: 'lektord' }).then(vlektord => { + event.reply('send-runnings', { + klkt: vklkt, + lektord: vlektord, + }); + }); }); - }); + }, 1000); + + setInterval(() => { + if (lkt.isStatusUpdated()) { + event.reply('send-state', lkt.getStatus().state); + } + }, 50); }); });