Author: duncan
Date: Sat Oct 13 08:39:25 2007
New Revision: 9955

Log:
Changed *_DEBUG to DEBUG_*, *_LOGGING to LOGGING_* and *_VOLUME to VOLUME_*
This is for the config.rpy to reduce the number of exception cases


Modified:
   branches/rel-1/freevo/freevo_config.py
   branches/rel-1/freevo/local_conf.py.example
   branches/rel-1/freevo/src/audio/plugins/radioplayer.py
   branches/rel-1/freevo/src/childapp.py
   branches/rel-1/freevo/src/config.py
   branches/rel-1/freevo/src/helpers/commdetectserver.py
   branches/rel-1/freevo/src/helpers/convert_config.py
   branches/rel-1/freevo/src/helpers/encodingserver.py
   branches/rel-1/freevo/src/helpers/recordserver.py
   branches/rel-1/freevo/src/helpers/webserver.py
   branches/rel-1/freevo/src/main.py
   branches/rel-1/freevo/src/plugins/alsamixer.py
   branches/rel-1/freevo/src/plugins/idlebar/volume.py
   branches/rel-1/freevo/src/plugins/mixer.py
   branches/rel-1/freevo/src/plugins/ossmixer.py
   branches/rel-1/freevo/src/rssperiodic.py
   branches/rel-1/freevo/src/skins/main/area.py
   branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py
   branches/rel-1/freevo/src/tv/plugins/mplayer.py
   branches/rel-1/freevo/src/tv/plugins/tvtime.py
   branches/rel-1/freevo/src/tv/plugins/xawtv.py
   branches/rel-1/freevo/src/video/plugins/mplayer.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 08:39:25 2007
@@ -291,10 +291,21 @@
      '''Added OS_STATICDIR, FREEVO_STATICDIR, OS_LOGDIR and FREEVO_LOGDIR
      Change static data to use /var/lib/freevo or ~/.freevo, including 
TV_RECORD_SCHEDULE, TV_LOGOS,
      XMLTV_FILE, you may also prefer OVERLAY_DIR to be 
FREEVO_STATICDIR+'/overlay',
-     Added a plugin that adds a submenu entry for ejecting rom drives and 
binds the default action of an empty drive to the eject action
+     Added a plugin that adds a submenu entry for ejecting rom drives and 
binds the default action of
+     an empty drive to the eject action
      Replaced OSD_OVERSCAN_X with OSD_OVERSCAN_LEFT and OSD_OVERSCAN_RIGHT and 
OSD_OVERSCAN_Y with 
      OSD_OVERSCAN_TOP and OSD_OVERSCAN_BOTTOM
      Added IMAGEVIEW_ASPECT to show images correctly on non-square pixel 
displays, it TVs
+     For the webserver configuration tool the following have been changed
+        PERSONAL_WWW_PAGE to WWW_PERSONAL_PAGE
+        TIME_DEBUG to DEBUG_TIME
+        CHILDAPP_DEBUG to DEBUG_CHILDAPP
+        RECORDSERVER_LOGGING to LOGGING_RECORDSERVER
+        DEFAULT_VOLUME to VOLUME_DEFAULT
+        TV_IN_VOLUME to VOLUME_TV_IN
+        VCR_IN_VOLUME to VOLUME_VCR_IN
+        RADIO_IN_VOLUME to VOLUME_RADIO_IN
+        MAX_VOLUME to VOLUME_MAX
      '''),
 ]
 

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 08:39:25 2007
@@ -1577,7 +1577,7 @@
 # WWW_JAVASCRIPT = 'scripts/display_prog-head.js'
 
 # Integrate personal web pages into the web server
-# PERSONAL_WWW_PAGE = [
+# WWW_PERSONAL_PAGE = [
 #     ('My Page', 'a single personal web page', 'page.html'),
 #     ('My Site', 'site description', 'site/'),
 # ]
@@ -1696,13 +1696,13 @@
 # debugging is a number from 0 to 9, 0 is no debugging 9 is most
 #
 # LOGGING = logging.DEBUG
-# RECORDSERVER_LOGGING = logging.DEBUG
+# LOGGING_RECORDSERVER = logging.DEBUG
 # DEBUG = 1
 # messages go to stdout
 # DEBUG_STDOUT = 0
 # messages from starting a child application
-# CHILDAPP_DEBUG = 1
+# DEBUG_CHILDAPP = 1
 # timing messages
-# TIME_DEBUG = 0
+# DEBUG_TIME = 0
 
 

Modified: branches/rel-1/freevo/src/audio/plugins/radioplayer.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/radioplayer.py      (original)
+++ branches/rel-1/freevo/src/audio/plugins/radioplayer.py      Sat Oct 13 
08:39:25 2007
@@ -94,7 +94,7 @@
 
         mixer = plugin.getbyname('MIXER')
         if mixer:
-            mixer_vol = config.RADIO_IN_VOLUME
+            mixer_vol = config.VOLUME_RADIO_IN
             mixer.setLineinVolume(mixer_vol)
             mixer.setIgainVolume(mixer_vol)
             mixer.setMicVolume(mixer_vol)

Modified: branches/rel-1/freevo/src/childapp.py
==============================================================================
--- branches/rel-1/freevo/src/childapp.py       (original)
+++ branches/rel-1/freevo/src/childapp.py       Sat Oct 13 08:39:25 2007
@@ -106,7 +106,7 @@
         if debugname:
             debug_name = debugname
 
-        if doeslogging or config.CHILDAPP_DEBUG:
+        if doeslogging or config.DEBUG_CHILDAPP:
             doeslogging = 1
 
         stdout_logger = os.path.join(config.FREEVO_LOGDIR, '%s-stdout-%s.log' 
% (debug_name, os.getuid()))

Modified: branches/rel-1/freevo/src/config.py
==============================================================================
--- branches/rel-1/freevo/src/config.py (original)
+++ branches/rel-1/freevo/src/config.py Sat Oct 13 08:39:25 2007
@@ -150,7 +150,7 @@
     vdev:         The video recording device, such as /dev/video0.
     vvbi:         The video vbi device, such as /dev/vbi0.
     adev:         The audio device, such as /dev/dsp.
-    input_type:   tuner, composite, svideo, webcam
+    input_type:   tuner, webcam
     input_num:    The number of this input according to V4L
     tuner_type:   internal (on a v4l device), or external (cable or sat box)
     tuner_norm:   NTSC, PAL, SECAM
@@ -160,7 +160,7 @@
     record_group: VideoGroup that records for this tuner, default is to use 
the same device for record and play
     desc:         A nice description for this VideoGroup.
     group_type:   Special variable to identify devices like dvb or ivtv.  This
-                  can be left as default, 'normal', or set to 'ivtv' or 'dvb'.
+                  can be left as default, 'normal', or set to 'ivtv', 'dvb', 
'webcam', 'tvalsa'.
     cmd:          Command for execute external prog after the channel 
switched, such as 'sudo /usr/local/bin/setuptuner'
     """
 
@@ -549,7 +549,6 @@
 if os.path.isfile(os.environ['FREEVO_CONFIG']):
     _debug_('Loading cfg: %s' % os.environ['FREEVO_CONFIG'])
     execfile(os.environ['FREEVO_CONFIG'], globals(), locals())
-
 else:
     print
     print "Error: %s: no such file" % os.environ['FREEVO_CONFIG']

Modified: branches/rel-1/freevo/src/helpers/commdetectserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/commdetectserver.py       (original)
+++ branches/rel-1/freevo/src/helpers/commdetectserver.py       Sat Oct 13 
08:39:25 2007
@@ -55,7 +55,7 @@
 
 from commdetectcore import CommDetectJob, CommDetectQueue
 
-DEBUG = hasattr(config, appconf+'_DEBUG') and eval('config.'+appconf+'_DEBUG') 
or config.DEBUG
+DEBUG = hasattr(config, 'DEBUG_'+appconf) and eval('config.DEBUG_'+appconf) or 
config.DEBUG
 
 logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
 log.startLogging(open(logfile, 'a'))

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 08:39:25 2007
@@ -75,6 +75,15 @@
     'recordable = False': 'record_group=None',
     'OSD_OVERSCAN_X': 'OSD_OVERSCAN_LEFT = OSD_OVERSCAN_RIGHT',
     'OSD_OVERSCAN_Y': 'OSD_OVERSCAN_TOP = OSD_OVERSCAN_BOTTOM',
+    'PERSONAL_WWW_PAGE': 'WWW_PERSONAL_PAGE',
+    'TIME_DEBUG': 'DEBUG_TIME',
+    'CHILDAPP_DEBUG': 'DEBUG_CHILDAPP',
+    'RECORDSERVER_LOGGING': 'LOGGING_RECORDSERVER',
+    'DEFAULT_VOLUME': 'VOLUME_DEFAULT',
+    'TV_IN_VOLUME': 'VOLUME_TV_IN',
+    'VCR_IN_VOLUME': 'VOLUME_VCR_IN',
+    'RADIO_IN_VOLUME': 'VOLUME_RADIO_IN',
+    'MAX_VOLUME': 'VOLUME_MAX',
     }
 
 def help():

Modified: branches/rel-1/freevo/src/helpers/encodingserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/encodingserver.py (original)
+++ branches/rel-1/freevo/src/helpers/encodingserver.py Sat Oct 13 08:39:25 2007
@@ -64,7 +64,7 @@
 __copyright__ = "Copyright (C) 2004 den_RDC"
 __license__ = "GPL"
 
-DEBUG = hasattr(config, appconf+'_DEBUG') and eval('config.'+appconf+'_DEBUG') 
or config.DEBUG
+DEBUG = hasattr(config, 'DEBUG_'+appconf) and eval('config.DEBUG_'+appconf) or 
config.DEBUG
 
 logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
 log.startLogging(open(logfile, 'a'))

Modified: branches/rel-1/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/recordserver.py   (original)
+++ branches/rel-1/freevo/src/helpers/recordserver.py   Sat Oct 13 08:39:25 2007
@@ -78,8 +78,8 @@
 from event import *
 
 
-DEBUG = hasattr(config, appconf+'_DEBUG') and eval('config.'+appconf+'_DEBUG') 
or config.DEBUG
-LOGGING = hasattr(config, appconf+'_LOGGING') and 
eval('config.'+appconf+'_LOGGING') or config.LOGGING
+DEBUG = hasattr(config, 'DEBUG_'+appconf) and eval('config.DEBUG_'+appconf) or 
config.DEBUG
+LOGGING = hasattr(config, 'LOGGING_'+appconf) and 
eval('config.LOGGING_'+appconf) or config.LOGGING
 
 def _debug_func_(s, level=1):
     import traceback

Modified: branches/rel-1/freevo/src/helpers/webserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/webserver.py      (original)
+++ branches/rel-1/freevo/src/helpers/webserver.py      Sat Oct 13 08:39:25 2007
@@ -62,7 +62,7 @@
     sys.exit(0)
 
 # No debugging in this module
-DEBUG = hasattr(config, appconf+'_DEBUG') and eval('config.'+appconf+'_DEBUG') 
or config.DEBUG
+DEBUG = hasattr(config, 'DEBUG_'+appconf) and eval('config.DEBUG_'+appconf) or 
config.DEBUG
 
 def _debug_(text, level=1):
     if DEBUG >= level:

Modified: branches/rel-1/freevo/src/main.py
==============================================================================
--- branches/rel-1/freevo/src/main.py   (original)
+++ branches/rel-1/freevo/src/main.py   Sat Oct 13 08:39:25 2007
@@ -283,10 +283,10 @@
             app = osd.focused_app()
             if app:
                 try:
-                    if config.TIME_DEBUG:
+                    if config.DEBUG_TIME:
                         t1 = time.clock()
                     app.eventhandler(event)
-                    if config.TIME_DEBUG:
+                    if config.DEBUG_TIME:
                         print time.clock() - t1
 
                 except SystemExit:

Modified: branches/rel-1/freevo/src/plugins/alsamixer.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/alsamixer.py      (original)
+++ branches/rel-1/freevo/src/plugins/alsamixer.py      Sat Oct 13 08:39:25 2007
@@ -110,15 +110,15 @@
         self.ogainVolume  = 0
 
         if config.MAJOR_AUDIO_CTRL == 'VOL':
-            self.setMainVolume(config.DEFAULT_VOLUME)
+            self.setMainVolume(config.VOLUME_DEFAULT)
             if config.CONTROL_ALL_AUDIO:
-                self.setPcmVolume(config.MAX_VOLUME)
-                self.setOgainVolume(config.MAX_VOLUME)
+                self.setPcmVolume(config.VOLUME_MAX)
+                self.setOgainVolume(config.VOLUME_MAX)
         elif config.MAJOR_AUDIO_CTRL == 'PCM':
-            self.setPcmVolume(config.DEFAULT_VOLUME)
+            self.setPcmVolume(config.VOLUME_DEFAULT)
             if config.CONTROL_ALL_AUDIO:
-                self.setMainVolume(config.MAX_VOLUME)
-                self.setOgainVolume(config.MAX_VOLUME)
+                self.setMainVolume(config.VOLUME_MAX)
+                self.setOgainVolume(config.VOLUME_MAX)
         else:
             _debug_("No appropriate audio channel found for mixer")
 
@@ -306,8 +306,8 @@
             self.setLineinVolume(0)
             self.setMicVolume(0)
             if config.MAJOR_AUDIO_CTRL == 'VOL':
-                self.setPcmVolume(config.DEFAULT_VOLUME)
+                self.setPcmVolume(config.VOLUME_DEFAULT)
             elif config.MAJOR_AUDIO_CTRL == 'PCM':
-                self.setMainVolume(config.DEFAULT_VOLUME)
+                self.setMainVolume(config.VOLUME_DEFAULT)
 
         self.setIgainVolume(0) # SB Live input from TV Card.

Modified: branches/rel-1/freevo/src/plugins/idlebar/volume.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/idlebar/volume.py (original)
+++ branches/rel-1/freevo/src/plugins/idlebar/volume.py Sat Oct 13 08:39:25 2007
@@ -69,7 +69,7 @@
         w = 0
         if mixer:
             muted = mixer.getMuted()
-            vol = (float(mixer.getVolume())/float(config.MAX_VOLUME))
+            vol = (float(mixer.getVolume())/float(config.VOLUME_MAX))
             if muted != self.muted or vol != self.volume:
                 self.muted  = muted
                 self.volume = vol

Modified: branches/rel-1/freevo/src/plugins/mixer.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/mixer.py  (original)
+++ branches/rel-1/freevo/src/plugins/mixer.py  Sat Oct 13 08:39:25 2007
@@ -88,19 +88,19 @@
                     pass
 
         if config.MAJOR_AUDIO_CTRL == 'VOL':
-            self.setMainVolume(config.DEFAULT_VOLUME)
+            self.setMainVolume(config.VOLUME_DEFAULT)
             if config.CONTROL_ALL_AUDIO:
-                self.setPcmVolume(config.MAX_VOLUME)
+                self.setPcmVolume(config.VOLUME_MAX)
                 # XXX This is for SB Live cards should do nothing to others
                 # XXX Please tell if you have problems with this.
-                self.setOgainVolume(config.MAX_VOLUME)
+                self.setOgainVolume(config.VOLUME_MAX)
         elif config.MAJOR_AUDIO_CTRL == 'PCM':
-            self.setPcmVolume(config.DEFAULT_VOLUME)
+            self.setPcmVolume(config.VOLUME_DEFAULT)
             if config.CONTROL_ALL_AUDIO:
-                self.setMainVolume(config.MAX_VOLUME)
+                self.setMainVolume(config.VOLUME_MAX)
                 # XXX This is for SB Live cards should do nothing to others
                 # XXX Please tell if you have problems with this.
-                self.setOgainVolume(config.MAX_VOLUME)
+                self.setOgainVolume(config.VOLUME_MAX)
         else:
             _debug_("No appropriate audio channel found for mixer")
 
@@ -270,8 +270,8 @@
             self.setLineinVolume(0)
             self.setMicVolume(0)
             if config.MAJOR_AUDIO_CTRL == 'VOL':
-                self.setPcmVolume(config.MAX_VOLUME)
+                self.setPcmVolume(config.VOLUME_MAX)
             elif config.MAJOR_AUDIO_CTRL == 'PCM':
-                self.setMainVolume(config.MAX_VOLUME)
+                self.setMainVolume(config.VOLUME_MAX)
 
         self.setIgainVolume(0) # SB Live input from TV Card.

Modified: branches/rel-1/freevo/src/plugins/ossmixer.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/ossmixer.py       (original)
+++ branches/rel-1/freevo/src/plugins/ossmixer.py       Sat Oct 13 08:39:25 2007
@@ -86,15 +86,15 @@
             self.ogainVolume  = 0
 
         if config.MAJOR_AUDIO_CTRL == 'VOL':
-            self.setMainVolume(config.DEFAULT_VOLUME)
+            self.setMainVolume(config.VOLUME_DEFAULT)
             if config.CONTROL_ALL_AUDIO:
-                self.setPcmVolume(config.MAX_VOLUME)
-                self.setOgainVolume(config.MAX_VOLUME)
+                self.setPcmVolume(config.VOLUME_MAX)
+                self.setOgainVolume(config.VOLUME_MAX)
         elif config.MAJOR_AUDIO_CTRL == 'PCM':
-            self.setPcmVolume(config.DEFAULT_VOLUME)
+            self.setPcmVolume(config.VOLUME_DEFAULT)
             if config.CONTROL_ALL_AUDIO:
-                self.setMainVolume(config.MAX_VOLUME)
-                self.setOgainVolume(config.MAX_VOLUME)
+                self.setMainVolume(config.VOLUME_MAX)
+                self.setOgainVolume(config.VOLUME_MAX)
         else:
             _debug_("No appropriate audio channel found for mixer")
 
@@ -256,8 +256,8 @@
             self.setLineinVolume(0)
             self.setMicVolume(0)
             if config.MAJOR_AUDIO_CTRL == 'VOL':
-                self.setPcmVolume(config.MAX_VOLUME)
+                self.setPcmVolume(config.VOLUME_MAX)
             elif config.MAJOR_AUDIO_CTRL == 'PCM':
-                self.setMainVolume(config.MAX_VOLUME)
+                self.setMainVolume(config.VOLUME_MAX)
 
         self.setIgainVolume(0) # SB Live input from TV Card.

Modified: branches/rel-1/freevo/src/rssperiodic.py
==============================================================================
--- branches/rel-1/freevo/src/rssperiodic.py    (original)
+++ branches/rel-1/freevo/src/rssperiodic.py    Sat Oct 13 08:39:25 2007
@@ -37,7 +37,8 @@
 
 appname = os.path.splitext(os.path.basename(sys.argv[0]))[0]
 appconf = appname.upper()
-DEBUG = hasattr(config, appconf+'_DEBUG') and eval('config.'+appconf+'_DEBUG') 
or config.DEBUG
+
+DEBUG = hasattr(config, 'DEBUG_'+appconf) and eval('config.DEBUG_'+appconf) or 
config.DEBUG
 
 def _debug_(text, level=1):
     if DEBUG >= level:

Modified: branches/rel-1/freevo/src/skins/main/area.py
==============================================================================
--- branches/rel-1/freevo/src/skins/main/area.py        (original)
+++ branches/rel-1/freevo/src/skins/main/area.py        Sat Oct 13 08:39:25 2007
@@ -267,7 +267,7 @@
         elif c_rect[0] < c_rect[2]:
             self.screen.update('content', c_rect)
 
-        if config.SKIN_DEBUG:
+        if config.DEBUG_SKIN:
             if self.layout:
                 name = self.area_name + u':' + self.layout.label
 

Modified: branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py        (original)
+++ branches/rel-1/freevo/src/tv/plugins/ivtv_xine_tv.py        Sat Oct 13 
08:39:25 2007
@@ -75,8 +75,8 @@
 if not config.TV_CHANNELS:
     _debug_("TV_CHANNELS is not configured!")
 
-if not config.TV_IN_VOLUME:
-    _debug_("TV_IN_VOLUME is not configured!")
+if not config.VOLUME_TV_IN:
+    _debug_("VOLUME_TV_IN is not configured!")
 
 if not config.MAJOR_AUDIO_CTRL:
     _debug_("MAJOR_AUDIO_CTRL is not configured!")
@@ -115,7 +115,7 @@
     The following items should be configured in local_conf.py:
 
     - TV_CHANNELS
-    - TV_IN_VOLUME
+    - VOLUME_TV_IN
     - MAJOR_AUDIO_CTRL
     - XINE_COMMAND
     - XINE_ARGS_DEF
@@ -527,8 +527,8 @@
 
         if (self.mixer != None):
 
-            self.mixer.setLineinVolume(config.TV_IN_VOLUME)
-            self.mixer.setIgainVolume(config.TV_IN_VOLUME)
+            self.mixer.setLineinVolume(config.VOLUME_TV_IN)
+            self.mixer.setIgainVolume(config.VOLUME_TV_IN)
 
             if config.MAJOR_AUDIO_CTRL == "VOL":
 

Modified: branches/rel-1/freevo/src/tv/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/mplayer.py     (original)
+++ branches/rel-1/freevo/src/tv/plugins/mplayer.py     Sat Oct 13 08:39:25 2007
@@ -202,10 +202,10 @@
         time.sleep(0.4)
         # XXX Hm.. This is hardcoded and very unflexible.
         if mixer and mode == 'vcr':
-            mixer.setMicVolume(config.VCR_IN_VOLUME)
+            mixer.setMicVolume(config.VOLUME_VCR_IN)
         elif mixer:
-            mixer.setLineinVolume(config.TV_IN_VOLUME)
-            mixer.setIgainVolume(config.TV_IN_VOLUME)
+            mixer.setLineinVolume(config.VOLUME_TV_IN)
+            mixer.setIgainVolume(config.VOLUME_TV_IN)
 
         if mixer and config.MAJOR_AUDIO_CTRL == 'VOL':
             mixer.setMainVolume(mixer_vol)

Modified: branches/rel-1/freevo/src/tv/plugins/tvtime.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/tvtime.py      (original)
+++ branches/rel-1/freevo/src/tv/plugins/tvtime.py      Sat Oct 13 08:39:25 2007
@@ -478,10 +478,10 @@
         time.sleep(0.4)
         # BUG Hm.. This is hardcoded and very unflexible.
         if mixer and mode == 'vcr':
-            mixer.setMicVolume(config.VCR_IN_VOLUME)
+            mixer.setMicVolume(config.VOLUME_VCR_IN)
         elif mixer:
-            mixer.setLineinVolume(config.TV_IN_VOLUME)
-            mixer.setIgainVolume(config.TV_IN_VOLUME)
+            mixer.setLineinVolume(config.VOLUME_TV_IN)
+            mixer.setIgainVolume(config.VOLUME_TV_IN)
 
         if mixer and config.MAJOR_AUDIO_CTRL == 'VOL':
             mixer.setMainVolume(mixer_vol)

Modified: branches/rel-1/freevo/src/tv/plugins/xawtv.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/xawtv.py       (original)
+++ branches/rel-1/freevo/src/tv/plugins/xawtv.py       Sat Oct 13 08:39:25 2007
@@ -198,10 +198,10 @@
         time.sleep(0.4)
         # BUG Hm.. This is hardcoded and very unflexible.
         if mixer and mode == 'vcr':
-            mixer.setMicVolume(config.VCR_IN_VOLUME)
+            mixer.setMicVolume(config.VOLUME_VCR_IN)
         elif mixer:
-            mixer.setLineinVolume(config.TV_IN_VOLUME)
-            mixer.setIgainVolume(config.TV_IN_VOLUME)
+            mixer.setLineinVolume(config.VOLUME_TV_IN)
+            mixer.setIgainVolume(config.VOLUME_TV_IN)
 
         if mixer and config.MAJOR_AUDIO_CTRL == 'VOL':
             mixer.setMainVolume(mixer_vol)

Modified: branches/rel-1/freevo/src/video/plugins/mplayer.py
==============================================================================
--- branches/rel-1/freevo/src/video/plugins/mplayer.py  (original)
+++ branches/rel-1/freevo/src/video/plugins/mplayer.py  Sat Oct 13 08:39:25 2007
@@ -215,7 +215,7 @@
         if not config.MPLAYER_ARGS.has_key(mode):
             mode = 'default'
 
-        if config.CHILDAPP_DEBUG:
+        if config.DEBUG_CHILDAPP:
             command += ['-v']
 
         # Mplayer command and standard arguments

-------------------------------------------------------------------------
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

Reply via email to