From ca7bc39ca14a165846f469bb2896ed1598dc2bbf Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Wed, 19 Jan 2022 20:09:45 -0800 Subject: [PATCH 1/4] added volume mute condition --- src/renderer/index.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/renderer/index.js b/src/renderer/index.js index 45c3a65d..9ecc5aab 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -709,6 +709,10 @@ const app = new Vue({ this.mk.addEventListener(MusicKit.Events.playbackVolumeDidChange, (_a) => { + if( this.cfg.audio.muted && this.cfg.audio.lastVolume != 0 ) { + this.cfg.audio.muted = false; + this.cfg.audio.lastVolume = 0; + } this.cfg.audio.volume = this.mk.volume }) @@ -3009,6 +3013,7 @@ const app = new Vue({ muteButtonPressed() { if( this.cfg.audio.muted ) { this.mk.volume = this.cfg.audio.lastVolume; + this.cfg.lastVolume = 0; this.cfg.audio.muted = false; } else { this.cfg.audio.lastVolume = this.cfg.audio.volume; From dea8d1528a81a388917e90487f8d9916f490e5ec Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Wed, 19 Jan 2022 20:14:47 -0800 Subject: [PATCH 2/4] revert album hide commit --- src/renderer/views/main.ejs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 065d2b2b..180d6c30 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -92,12 +92,10 @@
{{ mk.nowPlayingItem["attributes"]["artistName"] }}
{{"—"}}
{{(mk.nowPlayingItem["attributes"]["albumName"]) ? From a23bb9a6a5ff31e159e66d3033ee95a8c46add1d Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Wed, 19 Jan 2022 20:47:27 -0800 Subject: [PATCH 3/4] fixed volume condition (last commit broke it) --- src/renderer/index.js | 11 +++++------ src/renderer/views/components/fullscreen.ejs | 2 +- src/renderer/views/main.ejs | 6 ++++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/renderer/index.js b/src/renderer/index.js index 9ecc5aab..91f2c339 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -709,10 +709,6 @@ const app = new Vue({ this.mk.addEventListener(MusicKit.Events.playbackVolumeDidChange, (_a) => { - if( this.cfg.audio.muted && this.cfg.audio.lastVolume != 0 ) { - this.cfg.audio.muted = false; - this.cfg.audio.lastVolume = 0; - } this.cfg.audio.volume = this.mk.volume }) @@ -3013,7 +3009,6 @@ const app = new Vue({ muteButtonPressed() { if( this.cfg.audio.muted ) { this.mk.volume = this.cfg.audio.lastVolume; - this.cfg.lastVolume = 0; this.cfg.audio.muted = false; } else { this.cfg.audio.lastVolume = this.cfg.audio.volume; @@ -3021,7 +3016,11 @@ const app = new Vue({ this.cfg.audio.muted = true; } }, - + checkMuteChange() { + if( this.cfg.audio.muted ) { + this.cfg.audio.muted = false; + } + }, async apiCall(url, callback) { const xmlHttp = new XMLHttpRequest(); diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs index 2c0e8257..b93a27e5 100644 --- a/src/renderer/views/components/fullscreen.ejs +++ b/src/renderer/views/components/fullscreen.ejs @@ -81,7 +81,7 @@
+ v-if="typeof app.mk.volume != 'undefined'" @change="app.checkMuteChange()">
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 180d6c30..91ea36a5 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -134,7 +134,8 @@ + v-if="typeof mk.volume != 'undefined'" + @change="checkMuteChange()">
+ v-if="typeof mk.volume != 'undefined'" + @change="checkMuteChange()">
From 8af8e2102cca3dd152021375ef5627df99dd9114 Mon Sep 17 00:00:00 2001 From: child_duckling <19170969+quacksire@users.noreply.github.com> Date: Wed, 19 Jan 2022 21:27:43 -0800 Subject: [PATCH 4/4] itunes link handler/other uri parms --- src/main/base/app.ts | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/base/app.ts b/src/main/base/app.ts index 5e2d46bd..ce01748d 100644 --- a/src/main/base/app.ts +++ b/src/main/base/app.ts @@ -127,7 +127,7 @@ export class AppEvents { else if (arg.includes('/play/')) { //Steer away from protocol:// specific conditionals const playParam = arg.split('/play/')[1] - if (playParam.includes('s/')) { // setQueue can be done with album, song, url, playlist id + if (playParam.includes('s/')) { // song console.log(playParam) let song = playParam.split('s/')[1] console.warn(`[LinkHandler] Attempting to load song by id: ${song}`); @@ -136,7 +136,34 @@ export class AppEvents { // MusicKit.getInstance().play(); // }); // `) + } else if (playParam.includes('a/')) { // album + console.log(playParam) + let album = playParam.split('a/')[1] + console.warn(`[LinkHandler] Attempting to load album by id: ${album}`); + // AppEvents.window.webContents.executeJavaScript(` + // MusicKit.getInstance().setQueue({ album: '${album}'}).then(function(queue) { + // MusicKit.getInstance().play(); + // }); + // `) + } else if (playParam.includes('p/')) { // playlist + console.log(playParam) + let playlist = playParam.split('p/')[1] + console.warn(`[LinkHandler] Attempting to load playlist by id: ${playlist}`); + // AppEvents.window.webContents.executeJavaScript(` + // MusicKit.getInstance().setQueue({ playlist: '${playlist}'}).then(function(queue) { + // MusicKit.getInstance().play(); + // }); + // `) + } + } else if (arg.includes('music.apple.com')) { // URL (used with itms/itmss/music/musics uris) + console.log(arg) + let url = arg.split('//')[1] + console.warn(`[LinkHandler] Attempting to load url: ${url}`); + // AppEvents.window.webContents.executeJavaScript(` + // MusicKit.getInstance().setQueue({ url: 'https://${url}'}).then(function(queue) { + // MusicKit.getInstance().play(); + // }); + // `) } - } } } \ No newline at end of file