X-Git-Url: https://git.donarmstrong.com/?p=dactyl.git;a=blobdiff_plain;f=melodactyl%2Fcontent%2Fplayer.js;fp=melodactyl%2Fcontent%2Fplayer.js;h=f56b8cb0591253f8386692c6be47481155f4f245;hp=96e97a04254fdc8587b63282e0f6d7afeace4eef;hb=354a049cce8415487552ce405cce167b7071fe1f;hpb=3d837eb266a3a01d424192aa4ec1a167366178c5 diff --git a/melodactyl/content/player.js b/melodactyl/content/player.js index 96e97a0..f56b8cb 100644 --- a/melodactyl/content/player.js +++ b/melodactyl/content/player.js @@ -43,38 +43,38 @@ const Player = Module("player", { _mediaCoreListener: { onMediacoreEvent: function (event) { switch (event.type) { - case Ci.sbIMediacoreEvent.BEFORE_TRACK_CHANGE: - dactyl.log(_("player.preTrackChange", event.data)); - autocommands.trigger("TrackChangePre", { track: event.data }); - break; - case Ci.sbIMediacoreEvent.TRACK_CHANGE: - dactyl.log(_("player.trackChanged", event.data)); - autocommands.trigger("TrackChange", { track: event.data }); - break; - case Ci.sbIMediacoreEvent.BEFORE_VIEW_CHANGE: - dactyl.log(_("player.preViewChange", event.data)); - autocommands.trigger("ViewChangePre", { view: event.data }); - break; - case Ci.sbIMediacoreEvent.VIEW_CHANGE: - dactyl.log(_("player.viewChange", event.data)); - autocommands.trigger("ViewChange", { view: event.data }); - break; - case Ci.sbIMediacoreEvent.STREAM_START: - dactyl.log(_("player.trackStart", gMM.sequencer.currentItem)); - autocommands.trigger("StreamStart", { track: gMM.sequencer.currentItem }); - break; - case Ci.sbIMediacoreEvent.STREAM_PAUSE: - dactyl.log(_("player.trackPause", gMM.sequencer.currentItem)); - autocommands.trigger("StreamPause", { track: gMM.sequencer.currentItem }); - break; - case Ci.sbIMediacoreEvent.STREAM_END: - dactyl.log(_("player.trackEnd", gMM.sequencer.currentItem)); - autocommands.trigger("StreamEnd", { track: gMM.sequencer.currentItem }); - break; - case Ci.sbIMediacoreEvent.STREAM_STOP: - dactyl.log(_("player.trackStop", gMM.sequencer.currentItem)); - autocommands.trigger("StreamStop", { track: gMM.sequencer.currentItem }); - break; + case Ci.sbIMediacoreEvent.BEFORE_TRACK_CHANGE: + dactyl.log(_("player.preTrackChange", event.data)); + autocommands.trigger("TrackChangePre", { track: event.data }); + break; + case Ci.sbIMediacoreEvent.TRACK_CHANGE: + dactyl.log(_("player.trackChanged", event.data)); + autocommands.trigger("TrackChange", { track: event.data }); + break; + case Ci.sbIMediacoreEvent.BEFORE_VIEW_CHANGE: + dactyl.log(_("player.preViewChange", event.data)); + autocommands.trigger("ViewChangePre", { view: event.data }); + break; + case Ci.sbIMediacoreEvent.VIEW_CHANGE: + dactyl.log(_("player.viewChange", event.data)); + autocommands.trigger("ViewChange", { view: event.data }); + break; + case Ci.sbIMediacoreEvent.STREAM_START: + dactyl.log(_("player.trackStart", gMM.sequencer.currentItem)); + autocommands.trigger("StreamStart", { track: gMM.sequencer.currentItem }); + break; + case Ci.sbIMediacoreEvent.STREAM_PAUSE: + dactyl.log(_("player.trackPause", gMM.sequencer.currentItem)); + autocommands.trigger("StreamPause", { track: gMM.sequencer.currentItem }); + break; + case Ci.sbIMediacoreEvent.STREAM_END: + dactyl.log(_("player.trackEnd", gMM.sequencer.currentItem)); + autocommands.trigger("StreamEnd", { track: gMM.sequencer.currentItem }); + break; + case Ci.sbIMediacoreEvent.STREAM_STOP: + dactyl.log(_("player.trackStop", gMM.sequencer.currentItem)); + autocommands.trigger("StreamStop", { track: gMM.sequencer.currentItem }); + break; } } }, @@ -168,18 +168,18 @@ const Player = Module("player", { */ toggleRepeat: function toggleRepeat() { switch (gMM.sequencer.repeatMode) { - case gMM.sequencer.MODE_REPEAT_NONE: - gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_ONE; - break; - case gMM.sequencer.MODE_REPEAT_ONE: - gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_ALL; - break; - case gMM.sequencer.MODE_REPEAT_ALL: - gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_NONE; - break; - default: - gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_NONE; - break; + case gMM.sequencer.MODE_REPEAT_NONE: + gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_ONE; + break; + case gMM.sequencer.MODE_REPEAT_ONE: + gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_ALL; + break; + case gMM.sequencer.MODE_REPEAT_ALL: + gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_NONE; + break; + default: + gMM.sequencer.repeatMode = gMM.sequencer.MODE_REPEAT_NONE; + break; } }, @@ -343,7 +343,7 @@ const Player = Module("player", { onEnumerationEnd: function () { }, onEnumeratedItem: function (list, item) { // FIXME: why are there null items and duplicates? - if (!playlists.some(function (list) list.name == item.name) && item.name != null) + if (!playlists.some(list => list.name == item.name) && item.name != null) playlists.push(item); return Ci.sbIMediaListEnumerationListener.CONTINUE; } @@ -372,7 +372,7 @@ const Player = Module("player", { getMediaPages: function getMediaPages() { let list = SBGetBrowser().currentMediaPage.mediaListView.mediaList; let pages = services.mediaPageManager.getAvailablePages(list); - return ArrayConverter.JSArray(pages).map(function (page) page.QueryInterface(Ci.sbIMediaPageInfo)); + return ArrayConverter.JSArray(pages).map(page => page.QueryInterface(Ci.sbIMediaPageInfo)); }, /** @@ -414,27 +414,27 @@ const Player = Module("player", { properties.strict = false; switch (field) { - case "title": - properties.appendProperty(SBProperties.trackName, order); - break; - case "time": - properties.appendProperty(SBProperties.duration, order); - break; - case "artist": - properties.appendProperty(SBProperties.artistName, order); - break; - case "album": - properties.appendProperty(SBProperties.albumName, order); - break; - case "genre": - properties.appendProperty(SBProperties.genre, order); - break; - case "rating": - properties.appendProperty(SBProperties.rating, order); - break; - default: - properties.appendProperty(SBProperties.trackName, order); - break; + case "title": + properties.appendProperty(SBProperties.trackName, order); + break; + case "time": + properties.appendProperty(SBProperties.duration, order); + break; + case "artist": + properties.appendProperty(SBProperties.artistName, order); + break; + case "album": + properties.appendProperty(SBProperties.albumName, order); + break; + case "genre": + properties.appendProperty(SBProperties.genre, order); + break; + case "rating": + properties.appendProperty(SBProperties.rating, order); + break; + default: + properties.appendProperty(SBProperties.trackName, order); + break; } this._currentView.setSort(properties); @@ -625,15 +625,15 @@ const Player = Module("player", { // args switch (args.length) { - case 3: - properties.appendProperty(SBProperties.trackName, args[2]); - case 2: - properties.appendProperty(SBProperties.albumName, args[1]); - case 1: - properties.appendProperty(SBProperties.artistName, args[0]); - break; - default: - break; + case 3: + properties.appendProperty(SBProperties.trackName, args[2]); + case 2: + properties.appendProperty(SBProperties.albumName, args[1]); + case 1: + properties.appendProperty(SBProperties.artistName, args[0]); + break; + default: + break; } let library = LibraryUtils.mainLibrary;