Update of /cvsroot/freevo/freevo
In directory sc8-pr-cvs1:/tmp/cvs-serv14877
Modified Files:
freevo_config.py
Removed Files:
record_config.py
Log Message:
Further integration of record_server. Moved config items and plugin info
into freevo_config.py. Also in freevo_config.py I moved FREEVO_CACHEDIR
higher up in the file so more things can use it.
Index: freevo_config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/freevo_config.py,v
retrieving revision 1.224
retrieving revision 1.225
diff -C2 -d -r1.224 -r1.225
*** freevo_config.py 6 Aug 2003 19:39:19 -0000 1.224
--- freevo_config.py 11 Aug 2003 18:01:24 -0000 1.225
***************
*** 299,311 ****
plugin.activate('tv.mplayer')
# For CD ripping
# plugin.activate('audio.cdbackup')
-
-
-
-
-
-
# For joystick support:
# plugin.activate('joy')
--- 299,316 ----
plugin.activate('tv.mplayer')
+ # For recording tv
+ #
+ # generic_record plugin needs VCR_CMD to be set correctly
+ plugin_record = plugin.activate('plugins.generic_record')
+ #
+ # Use this 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 the following two lines in local_conf.py:
+ # plugin.remove('plugins.generic_record')
+ # plugin_record = plugin.activate('plugins.ivtv_record')
+
# For CD ripping
# plugin.activate('audio.cdbackup')
# For joystick support:
# plugin.activate('joy')
***************
*** 370,373 ****
--- 375,389 ----
AUDIO_FORMAT_STRING = '%(t)s'
+ # ======================================================================
+ # Freevo cache dir:
+ # ======================================================================
+
+ if os.path.isdir('/var/cache/freevo'):
+ FREEVO_CACHEDIR = '/var/cache/freevo'
+ else:
+ if not os.path.isdir('/tmp/freevo/cache'):
+ os.makedirs('/tmp/freevo/cache')
+ FREEVO_CACHEDIR = '/tmp/freevo/cache'
+
# ======================================================================
***************
*** 515,518 ****
--- 531,536 ----
SUFFIX_SNES_FILES = [ 'smc', 'fig' ]
+ MAME_CACHE = '%s/romlist-%s.pickled' % (FREEVO_CACHEDIR, os.getuid())
+
MAME_CMD = CONF.xmame
SNES_CMD = CONF.snes
***************
*** 807,810 ****
--- 825,830 ----
(TV_SETTINGS.split()[3], AUDIO_INPUT_DEVICE)
+ TIMESHIFT_BUFFER = '%s/timeshift.mpeg' % FREEVO_CACHEDIR
+
TV_CHANNEL_PROG = './chchan %(channel)s %(norm)s %(freqtable)s'
***************
*** 830,835 ****
# XXX * * * * * /usr/local/freevo/freevo execute src/tv/record_daemon.py
REC_SCHEDULE_FILE = '/tmp/freevo_record.lst'
! REC_SCHEDULE = '/tmp/freevo_record.pickle'
RECORD_SERVER_IP = 'localhost'
--- 850,858 ----
# XXX * * * * * /usr/local/freevo/freevo execute src/tv/record_daemon.py
+ # if using record_daemon from cron
REC_SCHEDULE_FILE = '/tmp/freevo_record.lst'
!
! # if using the persitant record_server
! RECORD_SCHEDULE = '%s/record_schedule.xml' % FREEVO_CACHEDIR
RECORD_SERVER_IP = 'localhost'
***************
*** 1108,1124 ****
REMOTE_CONTROL_PORT = 16310
- # Cache for Freevo data
-
- if os.path.isdir('/var/cache/freevo'):
- FREEVO_CACHEDIR = '/var/cache/freevo'
- else:
- if not os.path.isdir('/tmp/freevo/cache'):
- os.makedirs('/tmp/freevo/cache')
- FREEVO_CACHEDIR = '/tmp/freevo/cache'
-
- import os
- MAME_CACHE = '%s/romlist-%s.pickled' % (FREEVO_CACHEDIR, os.getuid())
-
- TIMESHIFT_BUFFER = '%s/timeshift.mpeg' % FREEVO_CACHEDIR
#
--- 1131,1134 ----
--- record_config.py DELETED ---
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
