Author: duncan
Date: Sun Nov 11 00:07:45 2007
New Revision: 10098
Log:
Merged changes from rel-1
Modified:
branches/rel-1-7/freevo/src/tv/channels.py
branches/rel-1-7/freevo/src/tv/plugins/ivtv_record.py
branches/rel-1-7/freevo/src/tv/plugins/ivtv_xine_tv.py
branches/rel-1-7/freevo/src/tv/plugins/mplayer.py
branches/rel-1-7/freevo/src/tv/plugins/tvtime.py
branches/rel-1-7/freevo/src/tv/plugins/vbi2srt_record.py
Modified: branches/rel-1-7/freevo/src/tv/channels.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/channels.py (original)
+++ branches/rel-1-7/freevo/src/tv/channels.py Sun Nov 11 00:07:45 2007
@@ -152,6 +152,7 @@
def tunerSetFreq(self, chan, isplayer, app=None, app_cmd=None):
+ _debug_('tunerSetFreq(chan=%r, isplayer=%r, app=%r, app_cmd=%r' %
(chan, isplayer, app, app_cmd), 2)
chan = str(chan)
vg = self.getVideoGroup(chan, isplayer)
@@ -194,12 +195,14 @@
try:
vd.setinputbyname(vg.input_type)
except KeyError:
- print 'Cannot set input %r, must be one of:\n%r' %
(vg.input_type, vd.inputs.keys())
+ print 'Cannot set input %r for %r, must be one of:\n%r' % \
+ (vg.input_type, vg.vdev, vd.inputs.keys())
try:
vd.setstdbyname(vg.tuner_norm)
except KeyError:
- print 'Cannot set standard %r, must be one of:\n%r' %
(vg.tuner_norm, tv.v4l2.NORMS.keys())
+ print 'Cannot set standard %r for %r, must be one of:\n%r'
% \
+ (vg.tuner_norm, vg.vdev, vd.standards.keys())
try:
vd.setfreq(freq)
Modified: branches/rel-1-7/freevo/src/tv/plugins/ivtv_record.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/plugins/ivtv_record.py (original)
+++ branches/rel-1-7/freevo/src/tv/plugins/ivtv_record.py Sun Nov 11
00:07:45 2007
@@ -124,8 +124,8 @@
v.init_settings()
vg = fc.getVideoGroup(self.prog.tunerid, False)
- _debug_('Setting Input to %s' % vg.input_num)
- v.setinput(vg.input_num)
+ _debug_('Setting Input to %s' % vg.input_type)
+ v.setinputbyname(vg.input_type)
cur_std = v.getstd()
try:
Modified: branches/rel-1-7/freevo/src/tv/plugins/ivtv_xine_tv.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/plugins/ivtv_xine_tv.py (original)
+++ branches/rel-1-7/freevo/src/tv/plugins/ivtv_xine_tv.py Sun Nov 11
00:07:45 2007
@@ -228,8 +228,7 @@
| VideoGroup(
| vdev='/dev/video0',
| adev=None,
- | input_type='tuner',
- | input_num=0,
+ | input_type='Tuner 1',
| tuner_norm='pal',
| tuner_chanlist='europe-west',
| desc='Regular Cable',
@@ -239,8 +238,7 @@
| VideoGroup(
| vdev='/dev/video0',
| adev=None,
- | input_type='svideo',
- | input_num=1,
+ | input_type='S-Video 1',
| tuner_type='external',
| desc='S-Video Input',
| group_type='ivtv',
@@ -249,15 +247,14 @@
| VideoGroup(
| vdev='/dev/video0',
| adev=None,
- | input_type='composite',
- | input_num=5,
+ | input_type='Composite 2',
| tuner_type='external',
| desc='Composite Input',
| group_type='ivtv',
| record_group = None
| ),
| ]
- |
+ |
| TV_CHANNELS = [
| ('ned1', 'NED 1', 'C22', '', 0),
| ...
Modified: branches/rel-1-7/freevo/src/tv/plugins/mplayer.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/plugins/mplayer.py (original)
+++ branches/rel-1-7/freevo/src/tv/plugins/mplayer.py Sun Nov 11 00:07:45 2007
@@ -84,9 +84,9 @@
vg = self.current_vg = self.fc.getVideoGroup(tuner_channel, True)
# Convert to MPlayer TV setting strings
- norm = 'norm=%s' % vg.tuner_norm
- input = 'input=%s' % vg.input_num
device= 'device=%s' % vg.vdev
+ input = 'input=%s' % vg.input_num
+ norm = 'norm=%s' % vg.tuner_norm
w, h = config.TV_VIEW_SIZE
outfmt = 'outfmt=%s' % config.TV_VIEW_OUTFMT
@@ -99,7 +99,7 @@
if vg.group_type == 'ivtv':
ivtv_dev = ivtv.IVTV(vg.vdev)
ivtv_dev.init_settings()
- ivtv_dev.setinput(vg.input_num)
+ ivtv_dev.setinputbyname(vg.input_type)
cur_std = ivtv_dev.getstd()
import tv.v4l2
try:
Modified: branches/rel-1-7/freevo/src/tv/plugins/tvtime.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/plugins/tvtime.py (original)
+++ branches/rel-1-7/freevo/src/tv/plugins/tvtime.py Sun Nov 11 00:07:45 2007
@@ -432,14 +432,8 @@
_debug_('starting channel is %s' % mychan)
- command = '%s %s -k -I %s -n %s -d %s -f %s -c %s -i %s' %
(config.TVTIME_CMD,
-
outputplugin,
- w,
- s_norm,
- cf_device,
- 'freevo',
- mychan,
- cf_input)
+ command = '%s %s -k -I %s -n %s -d %s -f %s -c %s -i %s' % \
+ (config.TVTIME_CMD, outputplugin, w, s_norm, cf_device,
'freevo', mychan, cf_input)
if osd.get_fullscreen() == 1:
command += ' -m'
Modified: branches/rel-1-7/freevo/src/tv/plugins/vbi2srt_record.py
==============================================================================
--- branches/rel-1-7/freevo/src/tv/plugins/vbi2srt_record.py (original)
+++ branches/rel-1-7/freevo/src/tv/plugins/vbi2srt_record.py Sun Nov 11
00:07:45 2007
@@ -61,6 +61,8 @@
class PluginInterface(plugin.Plugin):
"""
Record subtitles from teletext pages (IVTV cards only)
+ Also uses the PDC (Programme Delivery Control) from VPS (Video
+ Programming Signal) to start and stop the recording.
The teletext page number is taken from TV_CHANNELS, eg:
@@ -215,16 +217,13 @@
fc = FreevoChannels()
_debug_('channel %s' % fc.getChannel())
- (v_norm, v_input, v_clist, v_dev) = config.TV_SETTINGS.split()
+ self.vg = fc.getVideoGroup(self.prog.tunerid, False)
- v = tv.ivtv.IVTV(v_dev)
+ v = tv.ivtv.IVTV(self.vg.vdev)
v.init_settings()
- self.vg = fc.getVideoGroup(self.prog.tunerid, False)
_debug_('Using video device %s' % self.vg.vdev)
- _debug_('Setting Input to %s' % self.vg.input_num)
- v.setinput(self.vg.input_num)
_debug_('Setting Channel to %s' % self.prog.tunerid)
fc.chanSet(str(self.prog.tunerid), False)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
