use config.plugins.isEnabled

This commit is contained in:
Araxeus
2021-11-22 22:52:38 +02:00
parent 4362101c0a
commit c99b95e611
4 changed files with 18 additions and 31 deletions

View File

@ -22,14 +22,12 @@ function registerMPRIS(win) {
const microToSec = n => Math.round(Number(n) / 1e6); const microToSec = n => Math.round(Number(n) / 1e6);
const seekTo = e => win.webContents.send("seekTo", microToSec(e.position)); const seekTo = e => win.webContents.send("seekTo", microToSec(e.position));
const seek = o => win.webContents.send("seek", microToSec(o)); const seekBy = o => win.webContents.send("seekBy", microToSec(o));
const player = setupMPRIS(); const player = setupMPRIS();
const mprisSeek = player.seeked; const mprisSeek = player.seeked;
win.webContents.send("registerOnSeek");
ipcMain.on('seeked', (_, t) => mprisSeek(secToMicro(t))); ipcMain.on('seeked', (_, t) => mprisSeek(secToMicro(t)));
let currentSeconds = 0; let currentSeconds = 0;
@ -59,7 +57,7 @@ function registerMPRIS(win) {
player.on("next", next); player.on("next", next);
player.on("previous", previous); player.on("previous", previous);
player.on('seek', seek); player.on('seek', seekBy);
player.on('position', seekTo); player.on('position', seekTo);
registerCallback(songInfo => { registerCallback(songInfo => {

View File

@ -27,7 +27,7 @@ const post = async (data) => {
fetch(url, { method: 'POST', headers, body: JSON.stringify({ data }) }).catch(e => console.log(`Error: '${e.code || e.errno}' - when trying to access obs-tuna webserver at port ${port}`)); fetch(url, { method: 'POST', headers, body: JSON.stringify({ data }) }).catch(e => console.log(`Error: '${e.code || e.errno}' - when trying to access obs-tuna webserver at port ${port}`));
} }
module.exports = async () => { module.exports = async (win) => {
ipcMain.on('timeChanged', async (_, t) => { ipcMain.on('timeChanged', async (_, t) => {
if (!data.title) return; if (!data.title) return;
data.progress = secToMilisec(t); data.progress = secToMilisec(t);

View File

@ -1,30 +1,15 @@
const { ipcRenderer } = require("electron"); const { ipcRenderer } = require("electron");
const config = require("../config");
module.exports.seekTo = seekTo; const is = require("electron-is");
function seekTo(t) {
document.querySelector('video').currentTime = t;
}
module.exports.seek = seek;
function seek(o) {
document.querySelector('video').currentTime += o;
}
module.exports.setupSongControls = () => { module.exports.setupSongControls = () => {
ipcRenderer.on("seekTo", async (_, t) => seekTo(t)); document.addEventListener('apiLoaded', e => {
ipcRenderer.on("seek", async (_, t) => seek(t)); ipcRenderer.on("seekTo", (_, t) => e.target.seekTo(t));
ipcRenderer.once("registerOnSeek", registerOnSeek) ipcRenderer.on("seekBy", (_, t) => e.target.seekBy(t));
};
async function registerOnSeek() { }, { once: true, passive: true })
const register = v => v.addEventListener('seeked', () => ipcRenderer.send('seeked', v.currentTime));
let video = document.querySelector('video'); if (is.linux() && config.plugins.isEnabled('shortcuts')) { // MPRIS Enabled
if (video) { document.querySelector('video').addEventListener('seeked', () => ipcRenderer.send('seeked', v.currentTime));
register(video);
} }
else { };
document.addEventListener('apiLoaded', () => {
register(document.querySelector('video'))
}, { once: true, passive: true })
}
}

View File

@ -2,6 +2,8 @@ const { ipcRenderer } = require("electron");
const { getImage } = require("./song-info"); const { getImage } = require("./song-info");
const config = require("../config");
global.songInfo = {}; global.songInfo = {};
function $(selector) { return document.querySelector(selector); } function $(selector) { return document.querySelector(selector); }
@ -13,7 +15,9 @@ ipcRenderer.on("update-song-info", async (_, extractedSongInfo) => {
module.exports = () => { module.exports = () => {
document.addEventListener('apiLoaded', e => { document.addEventListener('apiLoaded', e => {
setupTimeChangeListener(); if (config.plugins.isEnabled('tuna-obs')) {
setupTimeChangeListener();
}
$('video').addEventListener('loadedmetadata', () => { $('video').addEventListener('loadedmetadata', () => {
const data = e.detail.getPlayerResponse(); const data = e.detail.getPlayerResponse();