Author: duncan
Date: Sun Feb 24 12:25:11 2008
New Revision: 10426
Log:
Removed xine ivtv stuff because it belongs in the plug-in
Corrected VideoGroup
Modified:
branches/rel-1-7/freevo/freevo_config.py
branches/rel-1-7/freevo/local_conf.py.example
Modified: branches/rel-1-7/freevo/freevo_config.py
==============================================================================
--- branches/rel-1-7/freevo/freevo_config.py (original)
+++ branches/rel-1-7/freevo/freevo_config.py Sun Feb 24 12:25:11 2008
@@ -754,7 +754,21 @@
# menus
-# ROM drive support
+# ======================================================================
+# Idlebar plug-ins
+# ======================================================================
+plugin.activate('idlebar')
+plugin.activate('idlebar.tv', level=20)
+plugin.activate('idlebar.cdstatus', level=25)
+plugin.activate('idlebar.diskfree', level=30)
+DISKFREE_VERY_LOW = 8 # In Gigabytes
+DISKFREE_LOW = 20
+plugin.activate('idlebar.clock', level=50)
+CLOCK_FORMAT = '%a %d %H:%M'
+
+# ======================================================================
+# Daemon plug-ins
+# ======================================================================
# autostarter when inserting roms while Freevo is in the MAIN MENU
plugin.activate('rom_drives.autostart')
@@ -858,18 +872,6 @@
# Enable this for joystick support:
# plugin.activate('joy')
-# ======================================================================
-# Idlebar and plugins
-# ======================================================================
-plugin.activate('idlebar')
-plugin.activate('idlebar.tv', level=20)
-plugin.activate('idlebar.cdstatus', level=25)
-plugin.activate('idlebar.diskfree', level=30)
-DISKFREE_VERY_LOW = 8 # In Gigabytes
-DISKFREE_LOW = 20
-plugin.activate('idlebar.clock', level=50)
-CLOCK_FORMAT = '%a %d %H:%M'
-
# ----------------------------------------------------------------------
# CD Ripping
# ----------------------------------------------------------------------
@@ -1013,9 +1015,9 @@
VIDEO_ITEMS = None
#
-# Directory containing images for tv shows. A tv show maches the regular
+# Directory containing images for TV shows. A TV show matches the regular
# expression VIDEO_SHOW_REGEXP, e.g. "Name 3x10 - Title". If an image
-# name.(png|jpg) (lowercase) is in this directory, it will be taken as cover
+# name.(png|jpg) (lower-case) is in this directory, it will be taken as cover
# image
#
VIDEO_SHOW_DATA_DIR = None
@@ -1849,7 +1851,8 @@
TV_VIDEO_GROUPS = [
VideoGroup(vdev=TV_DEVICE,
adev=AUDIO_DEVICE,
- input_type='tuner',
+ input_type='tuner 1',
+ input_num=0,
tuner_norm=CONF.tv,
tuner_chanlist=CONF.chanlist,
desc='Default Video Group',
Modified: branches/rel-1-7/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1-7/freevo/local_conf.py.example (original)
+++ branches/rel-1-7/freevo/local_conf.py.example Sun Feb 24 12:25:11 2008
@@ -1143,45 +1143,6 @@
# ======================================================================
-# IVTV Xine TV settings:
-# ======================================================================
-
-# -- plugin configuration --
-
-# plugin.remove('tv.mplayer')
-# plugin.activate('tv.ivtv_xine_tv')
-
-# Note: TV_IVTV_OPTIONS must be configured properly
-# Note: TV_FREQUENCY_TABLE must be configured properly
-# Note: XINE_COMMAND must be configured properly
-# Note: XINE_ARGS_DEF must be configured properly
-
-# -- TV/XINE configuration --
-
-# Video output device for TV. For Hauppage PVR x50,
-# use "xxmc" if you have hardware acceleration enabled.
-# Otherwise, see XINE_VO_DEV
-# XINE_TV_VO_DEV = "xxmc"
-
-# Audio output device to use for TV. See XINE_AO_DEV.
-# XINE_TV_AO_DEV = "alsa"
-
-# This specifies the path and filemask that xine uses for
-# timeshifting. File can get quite big (several gigabytes)
-# XINE_TV_TIMESHIFT_FILEMASK = "/tmp/xine-buf-"
-
-# Stop confirmation: press STOP twice to return to menu
-# XINE_TV_CONFIRM_STOP = True
-
-# This enables the progressive seek feature. The speed
-# for seeking (fast forward and rewind) is increased
-# automatically. The speed is increased every [THRESHOLD]
-# seconds in steps of [INCREMENT] secnds.
-# XINE_TV_PROGRESSIVE_SEEK = True
-# XINE_TV_PROGRESSIVE_SEEK_THRESHOLD = 2
-# XINE_TV_PROGRESSIVE_SEEK_INCREMENT = 5
-
-# ======================================================================
# Freevo TV settings:
# ======================================================================
@@ -1237,8 +1198,8 @@
#
# for fmtools
# RADIO_CMD = 'fm'
-# RADIO_CMD_START = (RADIO_CMD + ' ' + '-q %s 65535')
-# RADIO_CMD_STOP = (RADIO_CMD + ' ' + '-q off')
+# RADIO_CMD_START = (RADIO_CMD + ' -d %s ' % RADIO_DEVICE + ' -q %s 65535')
+# RADIO_CMD_STOP = (RADIO_CMD + ' -d %s ' % RADIO_DEVICE + ' -q off')
#
# for ivtv-radio
# RADIO_CMD = '/usr/bin/ivtv-radio -d /dev/radio0 -i /dev/video24'
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
