Author: duncan
Date: Sat Oct 13 10:53:13 2007
New Revision: 9957
Log:
More renamed config variables
Modified:
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/helpers/convert_config.py
branches/rel-1/freevo/src/helpers/plugins.py
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Sat Oct 13 10:53:13 2007
@@ -342,11 +342,11 @@
# and mute use different controls
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
-RADIO_IN_VOLUME = 80 # Set this to your preferred level 0-100.
+VOLUME_MAX = 90 # Set what you want maximum volume level
to be.
+VOLUME_DEFAULT = 40 # Set default volume level.
+VOLUME_TV_IN = 60 # Set this to your preferred level 0-100.
+VOLUME_VCR_IN = 90 # If you use different input from TV
+VOLUME_RADIO_IN = 80 # Set this to your preferred level 0-100.
DEV_MIXER = '/dev/mixer' # mixer device
START_FULLSCREEN_X = 0 # Start in fullscreen mode if using x11
or xv.
@@ -2027,17 +2027,17 @@
# store output of started processes for debug
# Set to 1 to log child application output to <app>_stdout.log and
<app>_stderr.log
#
-CHILDAPP_DEBUG = 0
+DEBUG_CHILDAPP = 0
-TIME_DEBUG = 0
+DEBUG_TIME = 0
# The default logging level
# can be one of CRITICAL (FATAL), ERROR, WARNING (WARN), INFO, DEBUG, NOTSET
LOGGING = logging.INFO
-WEBSERVER_LOGGING = logging.INFO
-RECORDSERVER_LOGGING = logging.INFO
-ENCODINGSERVER_LOGGING = logging.INFO
-RSSSERVER_LOGGING = logging.INFO
+LOGGING_WEBSERVER = logging.INFO
+LOGGING_RECORDSERVER = logging.INFO
+LOGGING_ENCODINGSERVER = logging.INFO
+LOGGING_RSSSERVER = logging.INFO
# When logging is DEBUG or NOTSET then DEBUG level logs messages
DEBUG = 0
Modified: branches/rel-1/freevo/local_conf.py.example
==============================================================================
--- branches/rel-1/freevo/local_conf.py.example (original)
+++ branches/rel-1/freevo/local_conf.py.example Sat Oct 13 10:53:13 2007
@@ -54,11 +54,11 @@
# # and mute use different controls
# 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
-# RADIO_IN_VOLUME = 80 # Set this to your preferred level
0-100.
+# VOLUME_MAX = 90 # Set what you want maximum volume
level to be.
+# VOLUME_DEFAULT = 40 # Set default volume level.
+# VOLUME_TV_IN = 60 # Set this to your preferred level
0-100.
+# VOLUME_VCR_IN = 90 # If you use different input from TV
+# VOLUME_RADIO_IN = 80 # Set this to your preferred level
0-100.
# DEV_MIXER = '/dev/mixer' # mixer device
# START_FULLSCREEN_X = 0 # Start in fullscreen mode if using x11
or xv.
Modified: branches/rel-1/freevo/src/helpers/convert_config.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/convert_config.py (original)
+++ branches/rel-1/freevo/src/helpers/convert_config.py Sat Oct 13 10:53:13 2007
@@ -78,7 +78,14 @@
'PERSONAL_WWW_PAGE': 'WWW_PERSONAL_PAGE',
'TIME_DEBUG': 'DEBUG_TIME',
'CHILDAPP_DEBUG': 'DEBUG_CHILDAPP',
+ 'RECORDSERVER_DEBUG': 'DEBUG_RECORDSERVER',
+ 'ENCODINGSERVER_DEBUG': 'DEBUG_ENCODINGSERVER',
+ 'RSSSERVER_DEBUG': 'DEBUG_RSSSERVER',
+ 'WEBSERVER_DEBUG': 'DEBUG_WEBSERVER',
'RECORDSERVER_LOGGING': 'LOGGING_RECORDSERVER',
+ 'ENCODINGSERVER_LOGGING': 'LOGGING_ENCODINGSERVER',
+ 'RSSSERVER_LOGGING': 'LOGGING_RSSSERVER',
+ 'WEBSERVER_LOGGING': 'LOGGING_WEBSERVER',
'DEFAULT_VOLUME': 'VOLUME_DEFAULT',
'TV_IN_VOLUME': 'VOLUME_TV_IN',
'VCR_IN_VOLUME': 'VOLUME_VCR_IN',
Modified: branches/rel-1/freevo/src/helpers/plugins.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/plugins.py (original)
+++ branches/rel-1/freevo/src/helpers/plugins.py Sat Oct 13 10:53:13 2007
@@ -131,8 +131,12 @@
print desc
print
if config_string.find('config') > 0:
- exec(config_string)
- config_list = return_config()
+ try:
+ exec(config_string)
+ config_list = return_config()
+ except SyntaxError, e:
+ config_list = None
+ print '%s in %r' % (e, config_string)
if config_list:
print
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
