Author: duncan
Date: Tue Oct 24 07:44:20 2006
New Revision: 8460
Modified:
branches/rel-1-6/freevo/src/tv/plugins/mplayer.py
Log:
[ 1583303 ] MPLAYER_AO_DEV doesn't work with Alsa hw device settings
Special handling for tv alsa modules has been added.
Modified: branches/rel-1-6/freevo/src/tv/plugins/mplayer.py
==============================================================================
--- branches/rel-1-6/freevo/src/tv/plugins/mplayer.py (original)
+++ branches/rel-1-6/freevo/src/tv/plugins/mplayer.py Tue Oct 24 07:44:20 2006
@@ -26,7 +26,7 @@
# with this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# ----------------------------------------------------------------------- */
+# -----------------------------------------------------------------------
# Configuration file. Determines where to look for AVI/MP3 files, etc
@@ -122,24 +122,29 @@
tvcmd = ''
args += ('"dvb://%s" %s' % (tuner_channel,
config.MPLAYER_ARGS['dvb']),)
- else:
+ elif vg.group_type == 'tvalsa':
freq_khz = self.fc.chanSet(tuner_channel, True, app='mplayer')
tuner_freq = '%1.3f' % (freq_khz / 1000.0)
- if vg.adev:
- tvcmd = ('tv:// -tv driver=%s:%s:freq=%s:%s:%s:'
- '%s:width=%s:height=%s:%s %s' %
- (config.TV_DRIVER, vg.adev, tuner_freq, device,
input, norm,
- w, h, outfmt, config.TV_OPTS))
- else:
- tvcmd = ('tv:// -tv driver=%s:freq=%s:%s:%s:'
- '%s:width=%s:height=%s:%s %s' %
- (config.TV_DRIVER, tuner_freq, device, input,
norm,
- w, h, outfmt, config.TV_OPTS))
+ tvcmd = ('tv:// -tv driver=%s:%s:freq=%s:%s:%s:'
+ '%s:width=%s:height=%s:%s %s' %
+ (config.TV_DRIVER, vg.adev, tuner_freq, device,
input, norm,
+ w, h, outfmt, config.TV_OPTS))
if config.MPLAYER_ARGS.has_key('tv'):
args += (config.MPLAYER_ARGS['tv'],)
+ else: # group_type == 'normal'
+ freq_khz = self.fc.chanSet(tuner_channel, True, app='mplayer')
+ tuner_freq = '%1.3f' % (freq_khz / 1000.0)
+
+ tvcmd = ('tv:// -tv driver=%s:freq=%s:%s:%s:'
+ '%s:width=%s:height=%s:%s %s' %
+ (config.TV_DRIVER, tuner_freq, device, input, norm,
+ w, h, outfmt, config.TV_OPTS))
+
+ if config.MPLAYER_ARGS.has_key('tv'):
+ args += (config.MPLAYER_ARGS['tv'],)
elif mode == 'vcr':
tvcmd = ('tv:// -tv driver=%s:%s:%s:'
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
