From 20688c4d75253220643fdbfcec11537aa6462500 Mon Sep 17 00:00:00 2001 From: "Adrian C. (anrxc)" Date: Mon, 14 Mar 2011 23:43:08 +0100 Subject: play: add missing formats to mplayer and promote it --- play.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'play.py') 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 = {} -- cgit v1.2.3