[pkg-freevo-commits] r223 - in packages/freevo/trunk/debian: . patches
Andrea Mennucci
mennucc1 at alioth.debian.org
Sat Oct 29 10:31:19 UTC 2011
Author: mennucc1
Date: 2011-10-29 10:31:18 +0000 (Sat, 29 Oct 2011)
New Revision: 223
Added:
packages/freevo/trunk/debian/patches/mplayer_use_default_vo_ao.diff
Modified:
packages/freevo/trunk/debian/changelog
packages/freevo/trunk/debian/patches/series
Log:
by default, use mplayer autodetect for video and audio drivers
Modified: packages/freevo/trunk/debian/changelog
===================================================================
--- packages/freevo/trunk/debian/changelog 2011-10-29 09:06:53 UTC (rev 222)
+++ packages/freevo/trunk/debian/changelog 2011-10-29 10:31:18 UTC (rev 223)
@@ -2,6 +2,7 @@
* python-freevo dependencies: add python-gdata, python-imdb, youtube-dl,
and bump version for kaa, and remove python-support
+ * by defaults, use mplayer autodetect for video and audio
--
Added: packages/freevo/trunk/debian/patches/mplayer_use_default_vo_ao.diff
===================================================================
--- packages/freevo/trunk/debian/patches/mplayer_use_default_vo_ao.diff (rev 0)
+++ packages/freevo/trunk/debian/patches/mplayer_use_default_vo_ao.diff 2011-10-29 10:31:18 UTC (rev 223)
@@ -0,0 +1,103 @@
+diff -ur freevo-1.9.2b2-orig/freevo_config.py freevo-1.9.2b2/freevo_config.py
+--- freevo-1.9.2b2-orig/freevo_config.py 2011-02-27 23:28:53.000000000 +0100
++++ freevo-1.9.2b2/freevo_config.py 2011-10-29 11:47:42.887044915 +0200
+@@ -1560,11 +1560,11 @@
+
+ MPLAYER_CMD = CONF.mplayer
+
+-MPLAYER_AO_DEV = 'oss:/dev/dsp' # e.g.: oss,sdl,alsa, see mplayer docs
++MPLAYER_AO_DEV = '' # use mplayer autodetect, see mplayer docs
+ MPLAYER_AO_DEV_OPTS = '' # e.g.: 'some_var=vcal'
+
+ if CONF.display == 'x11':
+- MPLAYER_VO_DEV = 'xv,sdl,x11,' # X11 drivers in order of preference
++ MPLAYER_VO_DEV = '' # use mplayer autodetect, see mplayer docs
+ else:
+ MPLAYER_VO_DEV = CONF.display # e.g.: x11,mga,fbdev, see mplayer docs
+
+Solo in freevo-1.9.2b2: freevo_config.py~
+diff -ur freevo-1.9.2b2-orig/local_conf.py.example freevo-1.9.2b2/local_conf.py.example
+--- freevo-1.9.2b2-orig/local_conf.py.example 2010-11-12 18:54:09.000000000 +0100
++++ freevo-1.9.2b2/local_conf.py.example 2011-10-29 11:49:05.081101004 +0200
+@@ -1024,9 +1024,10 @@
+
+ # MPLAYER_AO_DEV = 'oss:/dev/dsp' # e.g.: oss,sdl,alsa, see mplayer docs
+
+-# MPLAYER_VO_DEV specifies the -vo option to mplayer, if the display in
+-# freevo.conf is X11 then this defaults to xv,sdl,x11, see mplayer -vo help for
+-# the full list of output drivers.
++# MPLAYER_VO_DEV specifies the -vo option to mplayer;
++# see mplayer -vo help for the full list of output drivers;
++# if the display in freevo.conf is X11 then this defaults to ''
++# if it is set to the empty list, then mplayer autodetect will be used.
+ # MPLAYER_VO_DEV = 'dfbmga' # X11 drivers in order of preference
+ # MPLAYER_VO_DEV_OPTS = '' # e.g.: ':some_var=vcal'
+
+Solo in freevo-1.9.2b2: local_conf.py.example~
+diff -ur freevo-1.9.2b2-orig/src/audio/plugins/mplayer.py freevo-1.9.2b2/src/audio/plugins/mplayer.py
+--- freevo-1.9.2b2-orig/src/audio/plugins/mplayer.py 2011-02-15 22:03:55.000000000 +0100
++++ freevo-1.9.2b2/src/audio/plugins/mplayer.py 2011-10-29 11:14:27.527430021 +0200
+@@ -152,7 +152,8 @@
+ if hasattr(item, 'reconnect') and item.reconnect:
+ extra_opts += ' -loop 0'
+
+- command = '%s -vo null -ao %s %s %s' % (mpl, config.MPLAYER_AO_DEV, demux, extra_opts)
++ command = '%s -vo null %s %s %s' % (mpl, config.MPLAYER_AO_DEV and ('-ao %s' % config.MPLAYER_AO_DEV),
++ demux, extra_opts)
+
+ if command.find('-playlist') > 0:
+ command = command.replace('-playlist', '')
+Solo in freevo-1.9.2b2/src/audio/plugins: mplayer.py~
+diff -ur freevo-1.9.2b2-orig/src/tv/plugins/livepause/players.py freevo-1.9.2b2/src/tv/plugins/livepause/players.py
+--- freevo-1.9.2b2-orig/src/tv/plugins/livepause/players.py 2010-12-01 19:53:24.000000000 +0100
++++ freevo-1.9.2b2/src/tv/plugins/livepause/players.py 2011-10-29 11:43:32.121982774 +0200
+@@ -375,10 +375,12 @@
+ self.command += ['-v']
+
+ # Set audio out device
+- self.command += ['-ao'] + config.MPLAYER_AO_DEV.split(' ')
++ if config.MPLAYER_AO_DEV:
++ self.command += ['-ao'] + config.MPLAYER_AO_DEV.split(' ')
+
+ # Set video out device
+- self.command += ['-vo', config.MPLAYER_VO_DEV + config.MPLAYER_VO_DEV_OPTS]
++ if config.MPLAYER_VO_DEV:
++ self.command += ['-vo', config.MPLAYER_VO_DEV + config.MPLAYER_VO_DEV_OPTS]
+
+ # mode specific args
+ mode = 'default'
+Solo in freevo-1.9.2b2/src/tv/plugins/livepause: players.py~
+diff -ur freevo-1.9.2b2-orig/src/tv/plugins/mplayer.py freevo-1.9.2b2/src/tv/plugins/mplayer.py
+--- freevo-1.9.2b2-orig/src/tv/plugins/mplayer.py 2010-11-14 23:26:54.000000000 +0100
++++ freevo-1.9.2b2/src/tv/plugins/mplayer.py 2011-10-29 11:42:46.626126515 +0200
+@@ -97,10 +97,10 @@
+ args = {
+ 'nice': config.MPLAYER_NICE,
+ 'cmd': config.MPLAYER_CMD,
+- 'vo': '-vo %s' % config.MPLAYER_VO_DEV,
++ 'vo': config.MPLAYER_VO_DEV and ( '-vo %s' % config.MPLAYER_VO_DEV ),
+ 'vo_opts': config.MPLAYER_VO_DEV_OPTS,
+ 'vc': '',
+- 'ao': '-ao %s' % config.MPLAYER_AO_DEV,
++ 'ao': config.MPLAYER_AO_DEV and ( '-ao %s' % config.MPLAYER_AO_DEV ),
+ 'ao_opts': config.MPLAYER_AO_DEV_OPTS,
+ 'default_args': config.MPLAYER_ARGS_DEF.split(),
+ 'mode_args': config.MPLAYER_ARGS.has_key(mode) and config.MPLAYER_ARGS[mode].split() or [],
+Solo in freevo-1.9.2b2/src/tv/plugins: mplayer.py~
+diff -ur freevo-1.9.2b2-orig/src/video/plugins/mplayer.py freevo-1.9.2b2/src/video/plugins/mplayer.py
+--- freevo-1.9.2b2-orig/src/video/plugins/mplayer.py 2010-12-10 18:55:00.000000000 +0100
++++ freevo-1.9.2b2/src/video/plugins/mplayer.py 2011-10-29 11:12:30.530625119 +0200
+@@ -170,10 +170,10 @@
+ args = {
+ 'nice': config.MPLAYER_NICE,
+ 'cmd': config.MPLAYER_CMD,
+- 'vo': '-vo %s' % config.MPLAYER_VO_DEV,
++ 'vo': config.MPLAYER_VO_DEV and ( '-vo %s' % config.MPLAYER_VO_DEV ),
+ 'vo_opts': config.MPLAYER_VO_DEV_OPTS,
+ 'vc': '',
+- 'ao': '-ao %s' % config.MPLAYER_AO_DEV,
++ 'ao': config.MPLAYER_AO_DEV and ( '-ao %s' % config.MPLAYER_AO_DEV ),
+ 'ao_opts': config.MPLAYER_AO_DEV_OPTS,
+ 'default_args': config.MPLAYER_ARGS_DEF,
+ 'mode_args': config.MPLAYER_ARGS[mode],
+Solo in freevo-1.9.2b2/src/video/plugins: mplayer.py~
Modified: packages/freevo/trunk/debian/patches/series
===================================================================
--- packages/freevo/trunk/debian/patches/series 2011-10-29 09:06:53 UTC (rev 222)
+++ packages/freevo/trunk/debian/patches/series 2011-10-29 10:31:18 UTC (rev 223)
@@ -7,6 +7,7 @@
local_conf_py_example_remarks.diff
exit_0_if_running.diff
rc.py.diff
+mplayer_use_default_vo_ao.diff
#cdrom.patch
#weather.diff
More information about the Pkg-freevo-commits
mailing list