Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4809
Modified Files:
freevo_config.py
Log Message:
delete old tv variables, rename some and fix detection
Index: freevo_config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.374
retrieving revision 1.375
diff -C2 -d -r1.374 -r1.375
*** freevo_config.py 3 Dec 2004 20:11:10 -0000 1.374
--- freevo_config.py 5 Dec 2004 13:01:09 -0000 1.375
***************
*** 469,475 ****
# For recording tv
#
- # generic_record plugin needs VCR_CMD to be set correctly
- # plugin.activate('record.generic_record')
-
#
# Use ivtv_record instead if you have an ivtv based card (PVR-250/350)
--- 469,472 ----
***************
*** 1149,1153 ****
# This is where recorded video is written.
#
- # XXX the path doesn't work from the www cgi scripts!
TV_RECORD_DIR = None
--- 1146,1149 ----
***************
*** 1161,1174 ****
# under FREEVO_CACHEDIR and we don't want to blow /var or /tmp.
#
! TIMESHIFT_BUFFER_SIZE = 128
!
! TIMESHIFT_ENCODE_CMD = None
!
! TIMESHIFT_BUFFER = '%s/timeshift.mpeg' % FREEVO_CACHEDIR
!
! TV_CHANNEL_PROG = './chchan %(channel)s %(norm)s %(freqtable)s'
!
! TV_DATEFORMAT = '%e-%b' # Day-Month: 11-Jun
! TV_TIMEFORMAT = '%H:%M' # Hour-Minute 14:05
TV_DATETIMEFORMAT = '%A %b %d %I:%M %p' # Thursday September 24 8:54 am
--- 1157,1162 ----
# under FREEVO_CACHEDIR and we don't want to blow /var or /tmp.
#
! TV_DATEFORMAT = '%e-%b' # Day-Month: 11-Jun
! TV_TIMEFORMAT = '%H:%M' # Hour-Minute 14:05
TV_DATETIMEFORMAT = '%A %b %d %I:%M %p' # Thursday September 24 8:54 am
***************
*** 1188,1198 ****
TV_RECORDFILE_MASK = '%%m-%%d %%H:%%M %(progname)s - %(title)s'
- TV_RECORDFILE_SUFFIX = '.avi'
-
- # if using the persitant recordserver
- TV_RECORD_SCHEDULE = '%s/record_schedule.xml' % FREEVO_CACHEDIR
-
- TV_RECORD_SERVER_IP = 'localhost'
- TV_RECORD_SERVER_PORT = 18002
# If the recordserver runs as root, set the uid to the given one
--- 1176,1179 ----
***************
*** 1207,1219 ****
TV_RECORD_PADDING = 0 * 60
- if os.uname()[0] == 'FreeBSD':
- # FreeBSD's bsdbt848 TV driver doesn't support audio settings?
- VCR_AUDIO = ''
- else:
- VCR_AUDIO = (':adevice=%s' % AUDIO_DEVICE +
- ':audiorate=32000' + # 44100 for better sound
- ':forceaudio:forcechan=1:' + # Forced mono for bug in my driver
- 'buffersize=64') # 64MB capture buffer, change?
-
# TV capture size for viewing and recording. Max 768x480 for NTSC,
# 768x576 for PAL. Set lower if you have a slow computer!
--- 1188,1191 ----
***************
*** 1234,1266 ****
TV_REC_OUTFMT = 'yuy2'
- # PRE and POST recording commands. Set these to a runnable command if
- # you wish to have special mixer settings or video post processing.
- VCR_PRE_REC = None
- VCR_POST_REC = None
-
- # XXX Please see the mencoder docs for more info about the settings
- # XXX below. Some stuff must be changed (adevice), others probably
- # XXX should be ("Change"), or could be in some cases ("change?")
- 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
- ':chanlist=%s' % CONF.chanlist +
- ':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
- 'vcodec=mpeg4' + # lavcodec mpeg-4
- ':vbitrate=1200:' + # Change lower/higher, bitrate
- 'keyint=30 ' + # Keyframe every 10 secs, change?
- '-oac mp3lame -lameopts ' + # Use Lame for MP3 encoding, must
be enabled in mencoder!
- 'br=128:cbr:mode=3 ' + # MP3 const. bitrate, 128 kbit/s
- '-ffourcc divx ' + # Force 'divx' ident, better
compat.
- '-endpos %(seconds)s ' + # only mencoder uses this so do it
here.
- '-o %(filename)s') # Filled in by Freevo
-
-
#
# FREQUENCY_TABLE - This is only used when Freevo changes the channel
natively.
--- 1206,1209 ----
***************
*** 1309,1315 ****
# not present in the XMLTV listing.
#
- #
- # Timedependent channels:
- #
# The TV_CHANNELS-list can look like this:
#
--- 1252,1255 ----
***************
*** 1319,1336 ****
# ('27', 'TV4', 'E6'),
# ('10', 'Kanal 5', 'E7'),
- # ('60', 'Fox Kids', 'E8', ('1234567','0600','1659')),
- # ('16', 'TV6', 'E8', ('1234567','1700','2359'),
- # ('1234567','0000','0300')),
# ('14', 'MTV Europe', 'E11') ]
#
- # As you can see the list takes optional tuples:
- # ( 'DAYS', 'START','END')
- #
- # 1234567 in days means all days.
- # 12345 would mean monday to friday.
- #
- # It will display "Fox Kids" from 06:00 to 16:59 and "TV6" from 17:00 to
03:00.
- # 03:00 to 06:00 it won't be displayed at all.
- #
TV_CHANNELS = []
--- 1259,1264 ----
***************
*** 1343,1346 ****
--- 1271,1281 ----
TV_CHANNELS_EXCLUDE = []
+ # Default device for TV_CHANNELS
+ # Set to a device group like dvb, tv or ivtv or a special device like
+ # dvb0 or dvb1. Set to None for auto detection
+
+ TV_DEFAULT_DEVICE = None
+
+
# Program to grab xmltv listings. To get a grabber, you need to download
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
