mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2026-03-10 15:55:47 +01:00
imported patch dactylify
--HG-- rename : common/content/liberator-overlay.js => common/content/dactyl-overlay.js rename : common/content/liberator.js => common/content/dactyl.js rename : common/content/liberator.xul => common/content/dactyl.xul rename : common/skin/liberator.css => common/skin/dactyl.css rename : muttator/content/compose/liberator.dtd => muttator/content/compose/dactyl.dtd rename : muttator/content/compose/liberator.xul => muttator/content/compose/dactyl.xul rename : muttator/content/liberator.dtd => muttator/content/dactyl.dtd rename : vimperator/AUTHORS => pentadactyl/AUTHORS rename : vimperator/Donors => pentadactyl/Donors rename : vimperator/Makefile => pentadactyl/Makefile rename : vimperator/NEWS => pentadactyl/NEWS rename : vimperator/TODO => pentadactyl/TODO rename : vimperator/chrome.manifest => pentadactyl/chrome.manifest rename : vimperator/components/about-handler.js => pentadactyl/components/about-handler.js rename : vimperator/components/commandline-handler.js => pentadactyl/components/commandline-handler.js rename : vimperator/components/protocols.js => pentadactyl/components/protocols.js rename : vimperator/content/about.html => pentadactyl/content/about.html rename : vimperator/content/about_background.png => pentadactyl/content/about_background.png rename : vimperator/content/config.js => pentadactyl/content/config.js rename : vimperator/content/liberator.dtd => pentadactyl/content/dactyl.dtd rename : vimperator/content/logo.png => pentadactyl/content/logo.png rename : vimperator/content/vimperator.svg => pentadactyl/content/pentadactyl.svg rename : vimperator/content/vimperator.xul => pentadactyl/content/pentadactyl.xul rename : vimperator/contrib/vim/Makefile => pentadactyl/contrib/vim/Makefile rename : vimperator/contrib/vim/ftdetect/vimperator.vim => pentadactyl/contrib/vim/ftdetect/pentadactyl.vim rename : vimperator/contrib/vim/mkvimball.txt => pentadactyl/contrib/vim/mkvimball.txt rename : vimperator/contrib/vim/syntax/vimperator.vim => pentadactyl/contrib/vim/syntax/pentadactyl.vim rename : vimperator/install.rdf => pentadactyl/install.rdf rename : vimperator/locale/en-US/all.xml => pentadactyl/locale/en-US/all.xml rename : vimperator/locale/en-US/autocommands.xml => pentadactyl/locale/en-US/autocommands.xml rename : vimperator/locale/en-US/liberator.dtd => pentadactyl/locale/en-US/dactyl.dtd rename : vimperator/locale/en-US/gui.xml => pentadactyl/locale/en-US/gui.xml rename : vimperator/locale/en-US/intro.xml => pentadactyl/locale/en-US/intro.xml rename : vimperator/locale/en-US/options.xml => pentadactyl/locale/en-US/options.xml rename : vimperator/locale/en-US/tutorial.xml => pentadactyl/locale/en-US/tutorial.xml rename : vimperator/vimperatorrc.example => pentadactyl/pentadactylrc.example rename : vimperator/regressions.js => pentadactyl/regressions.js rename : vimperator/skin/about.css => pentadactyl/skin/about.css rename : vimperator/skin/icon.png => pentadactyl/skin/icon.png rename : xulmus/content/liberator.dtd => xulmus/content/dactyl.dtd rename : xulmus/locale/en-US/liberator.dtd => xulmus/locale/en-US/dactyl.dtd
This commit is contained in:
@@ -45,34 +45,34 @@ const Player = Module("player", {
|
||||
onMediacoreEvent: function (event) {
|
||||
switch (event.type) {
|
||||
case Ci.sbIMediacoreEvent.BEFORE_TRACK_CHANGE:
|
||||
liberator.log("Before track changed: " + event.data);
|
||||
dactyl.log("Before track changed: " + event.data);
|
||||
autocommands.trigger("TrackChangePre", { track: event.data });
|
||||
break;
|
||||
case Ci.sbIMediacoreEvent.TRACK_CHANGE:
|
||||
autocommands.trigger("TrackChange", { track: event.data });
|
||||
break;
|
||||
case Ci.sbIMediacoreEvent.BEFORE_VIEW_CHANGE:
|
||||
liberator.log("Before view changed: " + event.data);
|
||||
dactyl.log("Before view changed: " + event.data);
|
||||
autocommands.trigger("ViewChangePre", { view: event.data });
|
||||
break;
|
||||
case Ci.sbIMediacoreEvent.VIEW_CHANGE:
|
||||
liberator.log("View changed: " + event.data);
|
||||
dactyl.log("View changed: " + event.data);
|
||||
autocommands.trigger("ViewChange", { view: event.data });
|
||||
break;
|
||||
case Ci.sbIMediacoreEvent.STREAM_START:
|
||||
liberator.log("Track started: " + gMM.sequencer.currentItem);
|
||||
dactyl.log("Track started: " + gMM.sequencer.currentItem);
|
||||
autocommands.trigger("StreamStart", { track: gMM.sequencer.currentItem });
|
||||
break;
|
||||
case Ci.sbIMediacoreEvent.STREAM_PAUSE:
|
||||
liberator.log("Track paused: " + gMM.sequencer.currentItem);
|
||||
dactyl.log("Track paused: " + gMM.sequencer.currentItem);
|
||||
autocommands.trigger("StreamPause", { track: gMM.sequencer.currentItem });
|
||||
break;
|
||||
case Ci.sbIMediacoreEvent.STREAM_END:
|
||||
liberator.log("Track ended: " + gMM.sequencer.currentItem);
|
||||
dactyl.log("Track ended: " + gMM.sequencer.currentItem);
|
||||
autocommands.trigger("StreamEnd", { track: gMM.sequencer.currentItem });
|
||||
break;
|
||||
case Ci.sbIMediacoreEvent.STREAM_STOP:
|
||||
liberator.log("Track stopped: " + gMM.sequencer.currentItem);
|
||||
dactyl.log("Track stopped: " + gMM.sequencer.currentItem);
|
||||
autocommands.trigger("StreamStop", { track: gMM.sequencer.currentItem });
|
||||
break;
|
||||
}
|
||||
@@ -259,7 +259,7 @@ const Player = Module("player", {
|
||||
this.focusTrack(searchView.getItemByIndex(this._lastSearchIndex));
|
||||
}
|
||||
else
|
||||
liberator.echoerr("E486 Pattern not found: " + searchString, commandline.FORCE_SINGLELINE);
|
||||
dactyl.echoerr("E486 Pattern not found: " + searchString, commandline.FORCE_SINGLELINE);
|
||||
},
|
||||
|
||||
/**
|
||||
@@ -448,7 +448,7 @@ const Player = Module("player", {
|
||||
let view = LibraryUtils.createStandardMediaListView(LibraryUtils.mainLibrary, args.literalArg);
|
||||
|
||||
if (view.length == 0)
|
||||
liberator.echoerr("No Tracks matching the keywords");
|
||||
dactyl.echoerr("No Tracks matching the keywords");
|
||||
else {
|
||||
SBGetBrowser().loadMediaList(LibraryUtils.mainLibrary, null, null, view,
|
||||
"chrome://songbird/content/mediapages/filtersPage.xul");
|
||||
@@ -479,7 +479,7 @@ const Player = Module("player", {
|
||||
}
|
||||
}
|
||||
|
||||
liberator.echoerr("E475: Invalid argument: " + arg);
|
||||
dactyl.echoerr("E475: Invalid argument: " + arg);
|
||||
}
|
||||
else {
|
||||
// load main library if there are no args
|
||||
@@ -520,7 +520,7 @@ const Player = Module("player", {
|
||||
|
||||
// intentionally supports 999:99:99
|
||||
if (!/^[+-]?(\d+[smh]?|(\d+:\d\d:|\d+:)?\d{2})$/.test(arg))
|
||||
return void liberator.echoerr("E475: Invalid argument: " + arg);
|
||||
return void dactyl.echoerr("E475: Invalid argument: " + arg);
|
||||
|
||||
function ms(t, m) Math.abs(parseInt(t, 10) * { s: 1000, m: 60000, h: 3600000 }[m])
|
||||
|
||||
@@ -549,7 +549,7 @@ const Player = Module("player", {
|
||||
function (args) {
|
||||
// FIXME: is this a SB restriction? --djk
|
||||
if (!SBGetBrowser().currentMediaPage)
|
||||
return void liberator.echoerr("Exxx: Can only set the media view from the media tab"); // XXX
|
||||
return void dactyl.echoerr("Exxx: Can only set the media view from the media tab"); // XXX
|
||||
|
||||
let arg = args[0];
|
||||
|
||||
@@ -564,7 +564,7 @@ const Player = Module("player", {
|
||||
}
|
||||
}
|
||||
|
||||
liberator.echoerr("E475: Invalid argument: " + arg);
|
||||
dactyl.echoerr("E475: Invalid argument: " + arg);
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -624,7 +624,7 @@ const Player = Module("player", {
|
||||
let arg = args[0];
|
||||
|
||||
if (!/^[+-]?\d+$/.test(arg))
|
||||
return void liberator.echoerr("E488: Trailing characters");
|
||||
return void dactyl.echoerr("E488: Trailing characters");
|
||||
|
||||
let level = parseInt(arg, 10) / 100;
|
||||
|
||||
@@ -765,7 +765,7 @@ const Player = Module("player", {
|
||||
if (item)
|
||||
player.rateMediaItem(item, rating);
|
||||
else
|
||||
liberator.beep();
|
||||
dactyl.beep();
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user