Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23545/src
Modified Files:
config.py
Log Message:
Remove VideoGroup class and add TV_DEFAULT_SETTINGS which will allow users
to leave out dvb0: or tv0: from their tuner_id portion of TV_CHANNELS.
This may be overriden in local_conf.py.
Index: config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/config.py,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** config.py 13 Aug 2004 00:36:27 -0000 1.116
--- config.py 13 Aug 2004 02:05:39 -0000 1.117
***************
*** 23,26 ****
--- 23,31 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.117 2004/08/13 02:05:39 rshortt
+ # Remove VideoGroup class and add TV_DEFAULT_SETTINGS which will allow users
+ # to leave out dvb0: or tv0: from their tuner_id portion of TV_CHANNELS.
+ # This may be overriden in local_conf.py.
+ #
# Revision 1.116 2004/08/13 00:36:27 rshortt
# Set the right vdev for BSD.
***************
*** 156,199 ****
- class VideoGroup:
- """
- vdev: The video device, such as /dev/video.
- adev: The audio device, such as /dev/dsp.
- input_type: tuner, composite, svideo, webcam
- input_num: The number of this input according to V4L
- tuner_type: internal (on a v4l device), or external (cable or sat box)
- tuner_norm: NTSC, PAL, SECAM
- tuner_chanlist: us-cable,
- tuner_chan: If using input_type=tuner and tuner_type=external set this to
- what channel it needs to be to get the signal, usually 3 or 4.
- recordable: True or False. Can you record from this VideoGroup.
- desc: A nice description for this VideoGroup.
- group_type: Special variable to identify devices like dvb or ivtv. This
- can be left as default, 'normal', or set to 'ivtv' or 'dvb'.
- """
-
- def __init__(self, vdev='/dev/video', adev='/dev/dsp', input_type='tuner',
- input_num=0, tuner_norm='NTSC', tuner_chanlist='us-cable',
- tuner_type='internal', tuner_chan=None,
- recordable=True, desc='Freevo default VideoGroup',
- group_type='normal'):
-
- # XXX: Put checks in here for supplied values.
- self.vdev = vdev
- self.adev = adev
- self.input_type = input_type
- self.input_num = int(input_num)
- self.tuner_type = tuner_type
- self.tuner_norm = string.upper(tuner_norm)
- self.tuner_chanlist = tuner_chanlist
- self.tuner_chan = tuner_chan
- self.recordable = recordable
- self.desc = desc
- self.group_type = group_type
- self.in_use = FALSE
- self.tuner = None
-
-
-
def print_config_changes(conf_version, file_version, changelist):
"""
--- 161,164 ----
***************
*** 443,446 ****
--- 408,417 ----
+ TV_DEFAULT_SETTINGS = None
+
+ for type in ['dvb0', 'tv0', 'ivtv0']:
+ if type in TV_SETTINGS.keys():
+ TV_DEFAULT_SETTINGS = type
+ break
-------------------------------------------------------
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
