Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23342
Modified Files:
freevo_config.py local_conf.py.example
Log Message:
Remove a bunch of old tv settings.
Index: local_conf.py.example
===================================================================
RCS file: /cvsroot/freevo/freevo/local_conf.py.example,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** local_conf.py.example 1 Jul 2004 19:10:45 -0000 1.37
--- local_conf.py.example 13 Aug 2004 02:03:31 -0000 1.38
***************
*** 186,194 ****
#
# Use ivtv_record instead if you have an ivtv based card (PVR-250/350)
! # and want freevo to do everthing for you. TV_SETTINGS must be set
! # correctly. To use you need to set the following two lines:
#
! # plugin.remove('tv.generic_record')
! # plugin_record = plugin.activate('tv.ivtv_record')
#
--- 186,194 ----
#
# Use ivtv_record instead if you have an ivtv based card (PVR-250/350)
! # and want freevo to do everthing for you. To use you need to set the
! # following two lines:
#
! # plugin.remove('record.generic_record')
! # plugin.activate('record.ivtv_record')
#
***************
*** 699,734 ****
# Watching TV
#
- # XXX You must change this to fit your local conditions!
- #
- # NORM: ntsc, pal, secam
- # INPUT: television, composite1
- # CHANLIST: One of the following:
- #
- # us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west,
- # europe-east, italy, newzealand, australia, ireland, france, china-bcast,
- # southafrica, argentina, canada-cable
- #
- # TV_SETTINGS = 'NORM INPUT CHANLIST DEVICE'
-
- #
- # Video input device
- #
- # Usually /dev/video0, but might be /dev/video1 instead for multiple boards.
- #
- # FreeBSD uses the Brooktree TV-card driver, not V4L.
- #
- # TV_DRIVER = 'v4l'
- # TV_DEVICE = '/dev/video0'
- # TV_INPUT = 0
-
- #
- # Additional options to pass to mplayer in TV mode.
- #
- # eg. To turn off deinterlacing:
- # TV_OPTS = '-vop pp=ci'
- #
- # TV_OPTS = ''
-
- # TV_SETTINGS = '%s television %s %s' % (CONF.tv, CONF.chanlist, TV_DEVICE)
#
--- 699,702 ----
***************
*** 738,743 ****
# TIMESHIFT_BUFFER_SIZE = 128
! # TIMESHIFT_ENCODE_CMD = 'mp1e -m3 -c%s -p%s -r14,100' % \
! # (TV_SETTINGS.split()[3], AUDIO_INPUT_DEVICE)
# TIMESHIFT_BUFFER = '%s/timeshift.mpeg' % FREEVO_CACHEDIR
--- 706,710 ----
# TIMESHIFT_BUFFER_SIZE = 128
! # TIMESHIFT_ENCODE_CMD = None
# TIMESHIFT_BUFFER = '%s/timeshift.mpeg' % FREEVO_CACHEDIR
***************
*** 870,888 ****
- # VIDEO_GROUPS is a new setting to handle multiple arbitrary groups of devices
- # for viewing or recording. It will be possible to have different Freevo
- # channels use different Video Groups.
-
- # VIDEO_GROUPS = [
- # VideoGroup(vdev=TV_DEVICE,
- # adev=AUDIO_DEVICE,
- # input_type='tuner',
- # tuner_norm=CONF.tv,
- # tuner_chanlist=CONF.chanlist,
- # desc='Default Video Group',
- # recordable=True),
- # ]
-
-
#
# TV Channels. This list contains a mapping from the displayed channel name
--- 837,840 ----
Index: freevo_config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.351
retrieving revision 1.352
diff -C2 -d -r1.351 -r1.352
*** freevo_config.py 12 Aug 2004 16:52:48 -0000 1.351
--- freevo_config.py 13 Aug 2004 02:03:31 -0000 1.352
***************
*** 494,499 ****
#
# Use ivtv_record instead if you have an ivtv based card (PVR-250/350)
! # and want freevo to do everthing for you. TV_SETTINGS must be set
! # correctly. To use you need to set the following two lines:
#
# plugin.remove('record.generic_record')
--- 494,499 ----
#
# Use ivtv_record instead if you have an ivtv based card (PVR-250/350)
! # and want freevo to do everthing for you. To use you need to set the
! # following two lines:
#
# plugin.remove('record.generic_record')
***************
*** 1152,1186 ****
# Watching TV
#
- # XXX You must change this to fit your local conditions!
- #
- # TV_SETTINGS = 'NORM INPUT CHANLIST DEVICE'
- #
- # NORM: ntsc, pal, secam
- # INPUT: television, composite1
- # CHANLIST: One of the following:
- #
- # us-bcast, us-cable, us-cable-hrc, japan-bcast, japan-cable, europe-west,
- # europe-east, italy, newzealand, australia, ireland, france, china-bcast,
- # southafrica, argentina, canada-cable
- #
- # DEVICE: Usually /dev/video0, but might be /dev/video1 instead for multiple
- # boards.
- #
- # FreeBSD uses the Brooktree TV-card driver, not V4L.
- #
- if os.uname()[0] == 'FreeBSD':
- TV_DRIVER = 'bsdbt848'
- TV_DEVICE = '/dev/bktr0'
- TV_INPUT = 1
- else:
- TV_DRIVER = 'v4l'
- TV_DEVICE = '/dev/video0'
- TV_INPUT = 0
-
- # Additional options to pass to mplayer in TV mode.
- # For example, TV_OPTS = '-vop pp=ci' would turn on deinterlacing.
- TV_OPTS = ''
-
- # TV_SETTINGS = '%s television %s %s' % (CONF.tv, CONF.chanlist, TV_DEVICE)
#
--- 1152,1155 ----
***************
*** 1272,1276 ****
VCR_CMD = (CONF.mencoder + ' ' +
'tv:// ' + # New mplayer requires this.
! '-tv driver=%s:input=%d' % (TV_DRIVER, TV_INPUT) +
':norm=%s' % CONF.tv +
':channel=%(channel)s' + # Filled in by Freevo
--- 1241,1245 ----
VCR_CMD = (CONF.mencoder + ' ' +
'tv:// ' + # New mplayer requires this.
! '-tv driver=%(driver)s:input=%(input)d' +
':norm=%s' % CONF.tv +
':channel=%(channel)s' + # Filled in by Freevo
***************
*** 1278,1282 ****
':width=%d:height=%d' % (TV_REC_SIZE[0], TV_REC_SIZE[1]) +
':outfmt=%s' % TV_REC_OUTFMT +
! ':device=%s' % TV_DEVICE +
VCR_AUDIO + # set above
' -ovc lavc -lavcopts ' + # Mencoder lavcodec video codec
--- 1247,1251 ----
':width=%d:height=%d' % (TV_REC_SIZE[0], TV_REC_SIZE[1]) +
':outfmt=%s' % TV_REC_OUTFMT +
! ':device=%(device)s' +
VCR_AUDIO + # set above
' -ovc lavc -lavcopts ' + # Mencoder lavcodec video codec
***************
*** 1336,1354 ****
- # VIDEO_GROUPS is a new setting to handle multiple arbitrary groups of devices
- # for viewing or recording. It will be possible to have different Freevo
- # channels use different Video Groups.
-
- VIDEO_GROUPS = [
- VideoGroup(vdev=TV_DEVICE,
- adev=AUDIO_DEVICE,
- input_type='tuner',
- tuner_norm=CONF.tv,
- tuner_chanlist=CONF.chanlist,
- desc='Default Video Group',
- recordable=True),
- ]
-
-
#
# TV Channels. This list contains a mapping from the displayed channel name
--- 1305,1308 ----
-------------------------------------------------------
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
