Author: duncan
Date: Mon Oct 23 14:26:13 2006
New Revision: 8457
Modified:
branches/rel-1-6/freevo/src/config.py
branches/rel-1-6/freevo/src/tv/plugins/mplayer.py
Log:
Added adev usage for mplayer and saa7134-alsa
Modified: branches/rel-1-6/freevo/src/config.py
==============================================================================
--- branches/rel-1-6/freevo/src/config.py (original)
+++ branches/rel-1-6/freevo/src/config.py Mon Oct 23 14:26:13 2006
@@ -136,7 +136,7 @@
can be left as default, 'normal', or set to 'ivtv' or 'dvb'.
"""
- def __init__(self, vdev='/dev/video', adev='/dev/dsp', input_type='tuner',
+ def __init__(self, vdev='/dev/video', adev=None, input_type='tuner',
input_num=0, tuner_norm='NTSC', tuner_chanlist='us-cable',
tuner_type='internal', tuner_chan=None,
record_group=None, desc='Freevo default VideoGroup',
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 Mon Oct 23 14:26:13 2006
@@ -126,10 +126,16 @@
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 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))
if config.MPLAYER_ARGS.has_key('tv'):
args += (config.MPLAYER_ARGS['tv'],)
-------------------------------------------------------------------------
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
