Author: rshortt
Date: Wed Oct 19 00:22:59 2005
New Revision: 7749
Modified:
trunk/tvdev/src/devices.py
trunk/tvdev/src/tvcards.py
Log:
ivtv fixes, it starts up now but there's more to do.
Modified: trunk/tvdev/src/devices.py
==============================================================================
--- trunk/tvdev/src/devices.py (original)
+++ trunk/tvdev/src/devices.py Wed Oct 19 00:22:59 2005
@@ -99,10 +99,10 @@
Device.__init__(self, id, card)
- log.info(card.channels)
- for c in card.channels.keys():
- self.bouquets.append([])
- self.bouquets[-1].append(c)
+ # log.info(card.channels)
+ # for c in card.channels.keys():
+ # self.bouquets.append([])
+ # self.bouquets[-1].append(c)
def start_recording(self, channel, output):
Modified: trunk/tvdev/src/tvcards.py
==============================================================================
--- trunk/tvdev/src/tvcards.py (original)
+++ trunk/tvdev/src/tvcards.py Wed Oct 19 00:22:59 2005
@@ -94,8 +94,8 @@
"""
Class handling an analog tv card
"""
- def __init__(self, number, config):
- TVCard.__init__(self, 'tv%s' % number, config)
+ def __init__(self, number, config, type='tv'):
+ TVCard.__init__(self, '%s%s' % (type, number), config)
self.vdev = '/dev/video%s' % number
self.adev = None
@@ -140,8 +140,8 @@
"""
Class handling an ivtv analog tv card
"""
- def __init__(self, number):
- AnalogCard.__init__(self, number)
+ def __init__(self, number, config):
+ AnalogCard.__init__(self, number, config, 'ivtv')
self.priority = self.priority or 7
self.input = 4
@@ -289,7 +289,7 @@
if type == 'ivtv':
key = '%s%s' % (type, _ivtv_number)
log.debug('IVTV card detected as %s' % key)
- TV_CARDS[key] = IVTVCard
+ TV_CARDS[key] = IVTVCard(_ivtv_number, config)
if _ivtv_number != i:
TV_CARDS[key].vdev = vdev
_ivtv_number += 1
@@ -298,7 +298,7 @@
# Default to 'tv' type as set above.
key = '%s%s' % (type, _analog_tv_number)
log.debug('TV card detected as %s' % key)
- TV_CARDS[key] = AnalogCard(i, config)
+ TV_CARDS[key] = AnalogCard(_analog_tv_number, config)
if _analog_tv_number != i:
TV_CARDS[key].vdev = vdev
_analog_tv_number += 1
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
