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

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

Browse source
This commit is contained in:
Maikiwi 2022-02-16 18:45:07 -08:00
commit d2a776c76e
17 changed files with 195 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/base/browserwindow.ts
View file

@ -53,6 +53,7 @@ export class BrowserWindow {
"components/sidebar-playlist",
"components/spatial-properties",
"components/audio-settings",
"components/audio-controls",
"components/qrcode-modal",
"components/equalizer",
"components/add-to-playlist",

4
src/main/index.ts
View file

@ -69,6 +69,10 @@ ipcMain.on('nowPlayingItemDidChange', (_event, attributes) => {
CiderPlug.callPlugins('onNowPlayingItemDidChange', attributes);
});
ipcMain.on('lfmItemChange', (_event, attributes) => {
CiderPlug.callPlugins('lfmItemChange', attributes);
});
app.on('before-quit', () => {
CiderPlug.callPlugins('onBeforeQuit');
console.warn(`${app.getName()} exited.`);

12
src/main/plugins/lastfm.ts
View file

@ -257,20 +257,22 @@ export default class LastFMPlugin {
* @param attributes Music Attributes (attributes.status = current state)
*/
onPlaybackStateDidChange(attributes: object): void {
this.updateNowPlayingSong(attributes)
this.scrobbleSong(attributes)
this.updateNowPlayingSong(attributes)
// this.scrobbleSong(attributes)
}
/**
* Runs on song change
* @param attributes Music Attributes
*/
onNowPlayingItemDidChange(attributes: object): void {
lfmItemChange(attributes: any): void {
attributes.status = true
if (!this._store.lastfm.filterLoop){
this._lastfm.cachedNowPlayingAttributes = false;
this._lastfm.cachedAttributes = false}
this._lastfm.cachedAttributes = false
}
this.updateNowPlayingSong(attributes)
this.scrobbleSong(attributes)
this.scrobbleSong(attributes)
}
}