Author: duncan
Date: Thu Oct 26 13:00:27 2006
New Revision: 8479
Modified:
branches/rel-1-6/freevo/freevo_config.py
branches/rel-1-6/freevo/local_conf.py.example
Log:
White space tidy up
Modified: branches/rel-1-6/freevo/freevo_config.py
==============================================================================
--- branches/rel-1-6/freevo/freevo_config.py (original)
+++ branches/rel-1-6/freevo/freevo_config.py Thu Oct 26 13:00:27 2006
@@ -108,7 +108,7 @@
# of the config file doesn't match, Freevo won't start. If the minor version
# is different, there will be only a warning
-LOCAL_CONF_VERSION = 5.16
+LOCAL_CONF_VERSION = 5.16
# Description of changes in each new version
FREEVO_CONF_CHANGES = [
@@ -262,20 +262,20 @@
# General freevo settings:
# ======================================================================
-AUDIO_DEVICE = '/dev/dsp' # e.g.: /dev/dsp0, /dev/audio,
/dev/alsa/?
-AUDIO_INPUT_DEVICE = '/dev/dsp1' # e.g.: /dev/dsp0, /dev/audio,
/dev/alsa/?
-MAJOR_AUDIO_CTRL = 'VOL' # Freevo takes control over one audio
ctrl
+AUDIO_DEVICE = '/dev/dsp' # e.g.: /dev/dsp0, /dev/audio, /dev/alsa/?
+AUDIO_INPUT_DEVICE = '/dev/dsp1' # e.g.: /dev/dsp0, /dev/audio, /dev/alsa/?
+MAJOR_AUDIO_CTRL = 'VOL' # Freevo takes control over one audio ctrl
# 'VOL', 'PCM' 'OGAIN' etc.
-CONTROL_ALL_AUDIO = 1 # Should Freevo take complete control of
audio
-MAX_VOLUME = 90 # Set what you want maximum volume level
to be.
-DEFAULT_VOLUME = 40 # Set default volume level.
-TV_IN_VOLUME = 60 # Set this to your preferred level 0-100.
-VCR_IN_VOLUME = 90 # If you use different input from TV
-DEV_MIXER = '/dev/mixer' # mixer device
+CONTROL_ALL_AUDIO = 1 # Should Freevo take complete control of
audio
+MAX_VOLUME = 90 # Set what you want maximum volume level
to be.
+DEFAULT_VOLUME = 40 # Set default volume level.
+TV_IN_VOLUME = 60 # Set this to your preferred level 0-100.
+VCR_IN_VOLUME = 90 # If you use different input from TV
+DEV_MIXER = '/dev/mixer' # mixer device
-START_FULLSCREEN_X = 0 # Start in fullscreen mode if using x11
or xv.
+START_FULLSCREEN_X = 0 # Start in fullscreen mode if using x11
or xv.
-CONFIRM_SHUTDOWN = 1 # ask before shutdown
+CONFIRM_SHUTDOWN = 1 # ask before shutdown
#
# Physical ROM drives, multiple ones can be specified
@@ -342,7 +342,7 @@
# CONFIRM_SHUTDOWN
# Set to True to popup dialog boxes for confirmation.
# this applies to menu items only.
-AUTOSHUTDOWN_CONFIRM = True
+AUTOSHUTDOWN_CONFIRM=True
# -- autoshutdown timer configuration --
@@ -360,7 +360,7 @@
# PRETEND
# Set to True to disable the actual shutdown command.
-AUTOSHUTDOWN_PRETEND = False
+AUTOSHUTDOWN_PRETEND=False
# PROCESS_LIST
# List the processes that will prevent an automatic
@@ -446,7 +446,7 @@
# up with the rtc alarm that nvram-wakeup sets. The
# boot loader options should be set too. Read the
# nvram-wakeup documentation about this topic.
-AUTOSHUTDOWN_BIOS_NEEDS_REBOOT = True
+AUTOSHUTDOWN_BIOS_NEEDS_REBOOT=True
# -- if the bios needs a reboot --
@@ -572,7 +572,7 @@
#
# WARNING: you should not run 'freevo cache' when freevo is running.
#
-MEDIAINFO_USE_MEMORY = 1
+MEDIAINFO_USE_MEMORY = 1
#
# Cache images. This uses a lot of disc space but it's a huge speed
@@ -771,7 +771,7 @@
# Format string for the audio item names.
#
# Possible strings:
-# a = artist, n = tracknumber, t = title, y = year, f = filename
+# a=artist, n=tracknumber, t=title, y=year, f=filename
#
# Example:
# This will show the title and the track number:
@@ -803,23 +803,23 @@
# Make all items a playlist. So when one is finished, the next one will
# start. It's also possible to browse through the list with UP and DOWN
#
-DIRECTORY_CREATE_PLAYLIST = [ 'audio', 'image' ]
+DIRECTORY_CREATE_PLAYLIST = [ 'audio', 'image' ]
#
# Add playlist files ('m3u') to the directory
#
-DIRECTORY_ADD_PLAYLIST_FILES = [ 'audio', 'image' ]
+DIRECTORY_ADD_PLAYLIST_FILES = [ 'audio', 'image' ]
#
# Add the item 'Random Playlist' to the directory
#
-DIRECTORY_ADD_RANDOM_PLAYLIST = [ 'audio' ]
+DIRECTORY_ADD_RANDOM_PLAYLIST = [ 'audio' ]
#
# Make 'Play' not 'Browse' the default action when only items and not
# subdirectories are in the directory
#
-DIRECTORY_AUTOPLAY_ITEMS = [ ]
+DIRECTORY_AUTOPLAY_ITEMS = [ ]
# ======================================================================
@@ -910,7 +910,7 @@
# The list of filename suffixes that are used to match the files that
# are played as audio.
#
-AUDIO_SUFFIX = [ 'mp3', 'ogg', 'wav','m4a', 'wma', 'aac', 'flac',
'mka','ac3' ]
+AUDIO_SUFFIX = [ 'mp3', 'ogg', 'wav','m4a', 'wma', 'aac', 'flac', 'mka','ac3' ]
#
# Regular expression used to recognize filenames which are likely to be
@@ -1019,8 +1019,7 @@
# NEW GAMES SYSTEM :
# =================
# The GAMES_ITEMS structure is now build as follows :
-# <NAME>, <FOLDER>, (<TYPE>, <COMMAND_PATH>, <COMMAND_ARGS>, <IMAGE_PATH>, \
-# [<FILE_SUFFIX_FOR_GENERIC>])
+# <NAME>, <FOLDER>, (<TYPE>, <COMMAND_PATH>, <COMMAND_ARGS>, <IMAGE_PATH>,
[<FILE_SUFFIX_FOR_GENERIC>])
# where :
# - <TYPE> : Internal game types (MAME or SNES) or
# generic one (GENERIC)
@@ -1029,16 +1028,18 @@
# - <IMAGE_PATH> : Optionnal path to the picture
# - <FILE_SUFFIX_FOR_GENERIC> : If the folder use the GENERIC
# type, then you must specify here
-# the file suffix used by the emulator
-# GAMES_ITEMS = [ ('MAME', '/home/media/games/xmame/roms',
-# ('MAME', '/usr/local/bin/xmame.SDL', '-fullscreen -modenumber
6',
-# '/home/media/games/xmame/shots', None)),
-# ('SUPER NINTENDO', '/home/media/games/snes/roms',
-# ('SNES', '/usr/local/bin/zsnes', '-m -r 3 -k 100 -cs -u', '',
None )),
-# ('Visual Boy Advance', '/home/media/games/vba/roms/',
-# ('GENERIC', '/usr/local/vba/VisualBoyAdvance', ' ', '', [
'gba' ] )),
-# ('MEGADRIVE', '/home/media/games/megadrive/roms',
-# ('GENESIS', '/usr/local/bin/generator-svgalib', '', '', '' ))
]
+# the file suffix used by the
emulator
+# GAMES_ITEMS = [
+# ('MAME', '/home/media/games/xmame/roms',
+# ('MAME', '/usr/local/bin/xmame.SDL', '-fullscreen -modenumber 6',
+# '/home/media/games/xmame/shots', None)),
+# ('SUPER NINTENDO', '/home/media/games/snes/roms',
+# ('SNES', '/usr/local/bin/zsnes', '-m -r 3 -k 100 -cs -u', '', None
)),
+# ('Visual Boy Advance', '/home/media/games/vba/roms/',
+# ('GENERIC', '/usr/local/vba/VisualBoyAdvance', ' ', '', [ 'gba' ] )),
+# ('MEGADRIVE', '/home/media/games/megadrive/roms',
+# ('GENESIS', '/usr/local/bin/generator-svgalib', '', '', '' ))
+# ]
GAMES_ITEMS = None
@@ -1051,7 +1052,7 @@
# >0 - Lower priority
# <0 - Higher priority
#
-GAMES_NICE = -20
+GAMES_NICE = -20
#
# MAME cache directory
@@ -1107,7 +1108,7 @@
#
# System Path to search for fonts not included in the Freevo distribution
#
-OSD_EXTRA_FONT_PATH = [ '/usr/X11R6/lib/X11/fonts/truetype/' ]
+OSD_EXTRA_FONT_PATH = [ '/usr/X11R6/lib/X11/fonts/truetype/' ]
#
# Font aliases
@@ -1238,28 +1239,27 @@
MPLAYER_CMD = CONF.mplayer
-MPLAYER_AO_DEV = 'oss:/dev/dsp' # e.g.: oss,sdl,alsa, see mplayer docs
+MPLAYER_AO_DEV = 'oss:/dev/dsp' # e.g.: oss,sdl,alsa, see mplayer docs
if CONF.display == 'x11':
- MPLAYER_VO_DEV = 'xv,sdl,x11,' # X11 drivers in order of preference
+ MPLAYER_VO_DEV = 'xv,sdl,x11,' # X11 drivers in order of preference
else:
- MPLAYER_VO_DEV = CONF.display # e.g.: x11,mga,fbdev, see mplayer
docs
+ MPLAYER_VO_DEV = CONF.display # e.g.: x11,mga,fbdev, see mplayer docs
-MPLAYER_VO_DEV_OPTS = '' # e.g.: ':some_var=vcal'
+MPLAYER_VO_DEV_OPTS = '' # e.g.: ':some_var=vcal'
-DVD_LANG_PREF = 'en,se,no' # Order of preferred languages on DVD.
-DVD_SUBTITLE_PREF = '' # Order of preferred subtitles on DVD.
+DVD_LANG_PREF = 'en,se,no' # Order of preferred languages on DVD.
+DVD_SUBTITLE_PREF = '' # Order of preferred subtitles on DVD.
# Priority of mplayer process. 0 is unchanged, <0 is higher prio, >0 lower
prio.
# prio <0 has no effect unless run as root.
-MPLAYER_NICE = -20
+MPLAYER_NICE = -20
if CONF.display in ( 'directfb', 'dfbmga' ):
- MPLAYER_ARGS_DEF = ('-autosync 100 -nolirc ' +
- '-autoq 100 -fs ')
+ MPLAYER_ARGS_DEF = ('-autosync 100 -nolirc -autoq 100 -fs ')
else:
- MPLAYER_ARGS_DEF = (('-autosync 100 -nolirc -autoq 100 -screenw %s '
- + '-screenh %s -fs') % (CONF.width, CONF.height))
+ MPLAYER_ARGS_DEF = (('-autosync 100 -nolirc -autoq 100 -screenw %s '
+ + '-screenh %s -fs') % (CONF.width, CONF.height))
#
@@ -1319,12 +1319,12 @@
#
# Mplayer video filter for interlaced or progressive videos. If you have
# a slow pc, do not use post processing
-# MPLAYER_VF_INTERLACED = ''
+# MPLAYER_VF_INTERLACED = ''
# MPLAYER_VF_PROGRESSIVE = 'pp=fd'
# For pal and dvb-t recordings, the following looks good
-# MPLAYER_VF_INTERLACED = 'pp=md/de,phase=U'
+# MPLAYER_VF_INTERLACED = 'pp=md/de,phase=U'
#
-MPLAYER_VF_INTERLACED = 'pp=de/fd'
+MPLAYER_VF_INTERLACED = 'pp=de/fd'
MPLAYER_VF_PROGRESSIVE = 'pp=de'
# default to XINE_VO/AO_DEV:
@@ -1342,20 +1342,20 @@
XINE_COMMAND = ''
if CONF.display in ('mga', 'fbdev') and CONF.fbxine:
- XINE_VO_DEV = 'vidixfb'
+ XINE_VO_DEV = 'vidixfb'
XINE_COMMAND = CONF.fbxine
if CONF.display == 'dxr3' and CONF.fbxine:
- XINE_VO_DEV = 'dxr3'
+ XINE_VO_DEV = 'dxr3'
XINE_COMMAND = CONF.fbxine
if CONF.display == 'x11' and CONF.xine:
- XINE_VO_DEV = 'xv'
+ XINE_VO_DEV = 'xv'
XINE_COMMAND = '%s --hide-gui -pq -g -B --geometry %sx%s+0+0 --no-splash'
% \
(CONF.xine, CONF.width, CONF.height)
if CONF.display in ('dfbmga', 'directfb') and CONF.df_xine:
- XINE_VO_DEV = ''
+ XINE_VO_DEV = ''
XINE_COMMAND = CONF.df_xine
XINE_ARGS_DEF = "--no-lirc --post='pp:quality=10;expand'"
@@ -1370,7 +1370,7 @@
# default to XINE_VO/AO_DEV:
XINE_TV_VO_DEV = None
XINE_TV_AO_DEV = None
-XINE_TV_TIMESHIFT_FILEMASK = "/you must set XINE_TV_TIMESHIFT_FILEMASK in your
local_conf.py"
+XINE_TV_TIMESHIFT_FILEMASK = "you must set XINE_TV_TIMESHIFT_FILEMASK in your
local_conf.py"
# ======================================================================
# Freevo TV settings:
Modified: branches/rel-1-6/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1-6/freevo/local_conf.py.example (original)
+++ branches/rel-1-6/freevo/local_conf.py.example Thu Oct 26 13:00:27 2006
@@ -314,7 +314,7 @@
#
# WARNING: you should not run 'freevo cache' when freevo is running.
#
-# MEDIAINFO_USE_MEMORY = 1
+# MEDIAINFO_USE_MEMORY = 1
#
# Cache images. This uses a lot of disc space but it's a huge speed
@@ -422,7 +422,7 @@
# Format string for the audio item names.
#
# Possible strings:
-# a = artist, n = tracknumber, t = title, y = year, f = filename
+# a=artist, n=tracknumber, t=title, y=year, f=filename
#
# Example:
# This will show the title and the track number:
@@ -453,20 +453,20 @@
# Make all items a playlist. So when one is finished, the next one will
# start. It's also possible to browse through the list with UP and DOWN
#
-# DIRECTORY_CREATE_PLAYLIST = [ 'audio', 'image' ]
+# DIRECTORY_CREATE_PLAYLIST = [ 'audio', 'image' ]
# Add playlist files ('m3u') to the directory
#
-# DIRECTORY_ADD_PLAYLIST_FILES = [ 'audio', 'image' ]
+# DIRECTORY_ADD_PLAYLIST_FILES = [ 'audio', 'image' ]
# Add the item 'Random Playlist' to the directory
#
-# DIRECTORY_ADD_RANDOM_PLAYLIST = [ 'audio' ]
+# DIRECTORY_ADD_RANDOM_PLAYLIST = [ 'audio' ]
# Make 'Play' not 'Browse' the default action when only items and not
# subdirectories are in the directory
#
-# DIRECTORY_AUTOPLAY_ITEMS = [ ]
+# DIRECTORY_AUTOPLAY_ITEMS = [ ]
# ======================================================================
@@ -536,7 +536,7 @@
# The list of filename suffixes that are used to match the files that
# are played as audio.
#
-# AUDIO_SUFFIX = [ 'mp3', 'ogg', 'wav','m4a', 'wma', 'aac', 'flac', 'mka' ]
+# AUDIO_SUFFIX = [ 'mp3', 'ogg', 'wav','m4a', 'wma', 'aac', 'flac', 'mka' ]
#
# Regular expression used to recognize filenames which are likely to be
@@ -570,7 +570,7 @@
# The list of filename suffixes that are used to match the files that
# are used for the image viewer.
#
-# IMAGE_SUFFIX = [ 'jpg','gif','png', 'jpeg','bmp','tiff','psd' ]
+# IMAGE_SUFFIX = [ 'jpg','gif','png','jpeg','bmp','tiff','psd' ]
#
# The viewer now supports a new type of menu entry, a slideshow file.
@@ -620,15 +620,17 @@
# - <FILE_SUFFIX_FOR_GENERIC> : If the folder use the GENERIC
# type, then you must specify here
# the file suffix used by the emulator
-# GAMES_ITEMS = [ ('MAME', '/home/media/games/xmame/roms',
-# ('MAME', '/usr/local/bin/xmame.SDL', '-fullscreen -modenumber
6',
-# '/home/media/games/xmame/shots', None)),
-# ('SUPER NINTENDO', '/home/media/games/snes/roms',
-# ('SNES', '/usr/local/bin/zsnes', '-m -r 3 -k 100 -cs -u', '',
None )),
-# ('Visual Boy Advance', '/home/media/games/vba/roms/',
-# ('GENERIC', '/usr/local/vba/VisualBoyAdvance', ' ', '', [
'gba' ] )),
-# ('MEGADRIVE', '/home/media/games/megadrive/roms',
-# ('GENESIS', '/usr/local/bin/generator-svgalib', '', '', '' ))
]
+# GAMES_ITEMS = [
+# ('MAME', '/home/media/games/xmame/roms',
+# ('MAME', '/usr/local/bin/xmame.SDL', '-fullscreen -modenumber 6',
+# '/home/media/games/xmame/shots', None)),
+# ('SUPER NINTENDO', '/home/media/games/snes/roms',
+# ('SNES', '/usr/local/bin/zsnes', '-m -r 3 -k 100 -cs -u', '', None
)),
+# ('Visual Boy Advance', '/home/media/games/vba/roms/',
+# ('GENERIC', '/usr/local/vba/VisualBoyAdvance', ' ', '', [ 'gba' ] )),
+# ('MEGADRIVE', '/home/media/games/megadrive/roms',
+# ('GENESIS', '/usr/local/bin/generator-svgalib', '', '', '' ))
+# ]
#
# GAMES_ITEMS = None
@@ -683,7 +685,7 @@
#
# System Path to search for fonts not included in the Freevo distribution
#
-# OSD_EXTRA_FONT_PATH = [ '/usr/X11R6/lib/X11/fonts/truetype/' ]
+# OSD_EXTRA_FONT_PATH = [ '/usr/X11R6/lib/X11/fonts/truetype/' ]
#
# Font aliases
@@ -785,16 +787,16 @@
# MPlayer settings:
# ======================================================================
-# MPLAYER_AO_DEV = 'oss:/dev/dsp' # e.g.: oss,sdl,alsa, see mplayer docs
+# MPLAYER_AO_DEV = 'oss:/dev/dsp' # e.g.: oss,sdl,alsa, see mplayer docs
-# MPLAYER_VO_DEV_OPTS = '' # e.g.: ':some_var=vcal'
+# MPLAYER_VO_DEV_OPTS = '' # e.g.: ':some_var=vcal'
-# DVD_LANG_PREF = 'en,se,no' # Order of preferred languages on DVD.
-# DVD_SUBTITLE_PREF = '' # Order of preferred subtitles on DVD.
+# DVD_LANG_PREF = 'en,se,no' # Order of preferred languages on DVD.
+# DVD_SUBTITLE_PREF = '' # Order of preferred subtitles on DVD.
# Priority of mplayer process. 0 is unchanged, <0 is higher prio, >0 lower
prio.
# prio <0 has no effect unless run as root.
-# MPLAYER_NICE = -20
+# MPLAYER_NICE = -20
#
# Mplayer options to use the software scaler. If your CPU is fast enough, you
@@ -928,7 +930,7 @@
# europe-east, italy, newzealand, australia, ireland, france, china-bcast,
# southafrica, argentina, canada-cable, russia
#
-# TV_SETTINGS = 'NORM INPUT CHANLIST DEVICE'
+# TV_SETTINGS = 'NORM INPUT CHANLIST DEVICE'
#
# Video input device
@@ -1230,8 +1232,10 @@
#
# Username / Password combinations to login to the web interface.
#
-# WWW_USERS = { "user1" : "changeme",
-# "optional" : "changeme2" }
+# WWW_USERS = {
+# "user1" : "changeme",
+# "optional" : "changeme2"
+# }
#
#
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
