okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/ciderapp/Cider

Browse source
This commit is contained in:
vapormusic 2022-09-15 23:20:09 +07:00
commit 448dcba67a
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/renderer/main/events.js
View file

@ -59,9 +59,9 @@ const Events = {
app.mk._services.mediaItemPlayback._currentPlayer.destroy(); app.mk._services.mediaItemPlayback._currentPlayer.destroy();
} catch (e) {} } catch (e) {}
try { try {
this.radiohls.destroy() this.radiohls.destroy();
this.radiohls = null; this.radiohls = null;
} catch (_){} } catch (_) {}
try { try {
let searchInt = setInterval(function () { let searchInt = setInterval(function () {
if (document.getElementById("apple-music-player")) { if (document.getElementById("apple-music-player")) {

16
src/renderer/main/vueapp.js
View file

@ -1022,9 +1022,9 @@ const app = new Vue({
} // EVIL EMPTY OBJECTS BE GONE } // EVIL EMPTY OBJECTS BE GONE
try { try {
this.radiohls.destroy() this.radiohls.destroy();
this.radiohls = null; this.radiohls = null;
} catch (_){} } catch (_) {}
try { try {
if ((MusicKit.getInstance().nowPlayingItem["type"] ?? "").includes("ideo")) { if ((MusicKit.getInstance().nowPlayingItem["type"] ?? "").includes("ideo")) {
@ -5083,12 +5083,12 @@ const app = new Vue({
appData: { serviceName: "Apple Music" }, appData: { serviceName: "Apple Music" },
}; };
if (app.radiohls != null && app.radiohls.destroy != null) { if (app.radiohls != null && app.radiohls.destroy != null) {
app.radiohls.destroy(); app.radiohls.destroy();
app.radiohls = null; app.radiohls = null;
app.radiohls = new CiderHls(); app.radiohls = new CiderHls();
app.radiohls.loadSource(e); app.radiohls.loadSource(e);
app.radiohls.attachMedia(app.mk._services.mediaItemPlayback._currentPlayer._targetElement); app.radiohls.attachMedia(app.mk._services.mediaItemPlayback._currentPlayer._targetElement);
app.mk._services.mediaItemPlayback._currentPlayer._targetElement.play(); app.mk._services.mediaItemPlayback._currentPlayer._targetElement.play();
} else { } else {
app.radiohls = null; app.radiohls = null;
app.radiohls = new CiderHls(); app.radiohls = new CiderHls();