summaryrefslogtreecommitdiff
path: root/play.py
diff options
context:
space:
mode:
authorAdrian C. (anrxc) <anrxc@sysphere.org>2011-03-14 22:43:08 (GMT)
committerAdrian C. (anrxc) <anrxc@sysphere.org>2011-03-14 22:43:08 (GMT)
commit20688c4d75253220643fdbfcec11537aa6462500 (patch)
treee7df06e8981d3546b78bd7461785e05180a1f671 /play.py
parente4d238b6080cd3bcae6de45cdcf6a4df2df9f494 (diff)
downloadplay-20688c4d75253220643fdbfcec11537aa6462500.tar.xz
play: add missing formats to mplayer and promote it
Diffstat (limited to 'play.py')
-rwxr-xr-xplay.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/play.py b/play.py
index d21ff18..243e851 100755
--- a/play.py
+++ b/play.py
@@ -1700,15 +1700,15 @@ PLAYERS = [
FrameOffsetPlayer("mpg123 -q -v -k %d %s", "(^http://|\.mp[123]$)", 38.28),
FrameOffsetPlayer("mpg321 -q -v -k %d %s", "(^http://|\.mp[123]$)", 38.28),
FrameOffsetPlayerMpp("mppdec --gain 2 --start %d %s", "\.mp[cp+]$"),
+ TimeOffsetPlayerMplayer("mplayer -input file=%s -vc null -vo null {file}" %
+ (CONTROL_FIFO + "-mplayer"),
+ "^http://|\.(mp[123]|ogg|oga|flac|spx|mp[cp+]|mod|xm|fm|s3m|" +
+ "med|col|669|it|mtm|stm|aiff|au|cdr|wav|wma|m4a|m4b)$"),
TimeOffsetPlayer("madplay -v --display-time=remaining -s %d %s", "\.mp[123]$"),
NoOffsetPlayer("mikmod -q -p0 %s", "\.(mod|xm|fm|s3m|med|col|669|it|mtm)$"),
NoOffsetPlayer("xmp -q %s", "\.(mod|xm|fm|s3m|med|col|669|it|mtm|stm)$"),
NoOffsetPlayer("play %s", "\.(aiff|au|cdr|mp3|ogg|wav)$"),
NoOffsetPlayer("speexdec %s", "\.spx$"),
- TimeOffsetPlayerMplayer("mplayer -input file=%s -vc null -vo null {file}" %
- (CONTROL_FIFO + "-mplayer"),
- "^http://|\.(mp[123]|ogg|oga|flac|spx|mp[cp+]|mod|xm|fm|s3m|" +
- "med|col|669|it|mtm|stm|aiff|au|cdr|wav)$"),
]
MACRO = {}