Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25673/src
Modified Files:
config.py
Log Message:
More work on tv settings, configuration of v4l2 devices based on TV_SETTINGS.
Index: config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/config.py,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** config.py 13 Aug 2004 02:05:39 -0000 1.117
--- config.py 13 Aug 2004 16:17:33 -0000 1.118
***************
*** 23,26 ****
--- 23,29 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.118 2004/08/13 16:17:33 rshortt
+ # More work on tv settings, configuration of v4l2 devices based on TV_SETTINGS.
+ #
# Revision 1.117 2004/08/13 02:05:39 rshortt
# Remove VideoGroup class and add TV_DEFAULT_SETTINGS which will allow users
***************
*** 372,379 ****
if os.path.exists(vdev):
type = 'tv'
try:
import tv.v4l2
! v = tv.v4l2.Videodev(vdev)
! if string.find(v.driver, 'ivtv') != -1:
type = 'ivtv'
v.close()
--- 375,384 ----
if os.path.exists(vdev):
type = 'tv'
+ driver = None
try:
import tv.v4l2
! v = tv.v4l2.Videodev(device=vdev)
! driver = v.driver
! if string.find(driver, 'ivtv') != -1:
type = 'ivtv'
v.close()
***************
*** 385,396 ****
traceback.print_exc()
! if type == 'tv':
! key = '%s%s' % (type,tvn)
! TV_SETTINGS[key] = TVCard
! if tvn != i:
! TV_SETTINGS[key].vdev = vdev
! tvn = tvn + 1
!
! elif type == 'ivtv':
key = '%s%s' % (type,ivtvn)
TV_SETTINGS[key] = IVTVCard
--- 390,394 ----
traceback.print_exc()
! if type == 'ivtv':
key = '%s%s' % (type,ivtvn)
TV_SETTINGS[key] = IVTVCard
***************
*** 399,402 ****
--- 397,409 ----
ivtvn = ivtvn + 1
+ else:
+ # Default to 'tv' type as set above.
+ key = '%s%s' % (type,tvn)
+ TV_SETTINGS[key] = TVCard
+ if tvn != i:
+ TV_SETTINGS[key].vdev = vdev
+ tvn = tvn + 1
+
+ TV_SETTINGS[key].driver = driver
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
