Author: duncan
Date: Mon Oct 15 15:40:54 2007
New Revision: 9990
Log:
More renamed variables for webserver config tool
Sure that there are more of these to come but freevo convert_config
/path/to/local_conf.py does all the work
Modified:
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/howtomerge
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/audio/plugins/radioplayer.py
branches/rel-1/freevo/src/helpers/convert_config.py
branches/rel-1/freevo/src/plugins/alsamixer.py
branches/rel-1/freevo/src/plugins/autoshutdown.py
branches/rel-1/freevo/src/plugins/freevused.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/plugins/shutdown.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
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Mon Oct 15 15:40:54 2007
@@ -308,7 +308,17 @@
RADIO_IN_VOLUME to VOLUME_RADIO_IN
MAX_VOLUME to VOLUME_MAX
DEV_MIXER to VOLUME_MIXER_DEV
- Added VOLUME_MIXER_STEP to allow the mixer volume change to be specified
+ and subsequently these, sorry if this is a little inconvenient
+ CONTROL_ALL_AUDIO to MIXER_CONTROL_ALL
+ VOLUME_DEFAULT to MIXER_VOLUME_DEFAULT
+ VOLUME_VCR_IN to MIXER_VOLUME_VCR_IN
+ VOLUME_TV_IN to MIXER_VOLUME_TV_IN
+ VOLUME_MIXER_STEP to MIXER_VOLUME_STEP
+ VOLUME_RADIO_IN to MIXER_VOLUME_RADIO_IN
+ VOLUME_MAX to MIXER_VOLUME_MAX
+ VOLUME_MIXER_DEV to MIXER_DEVICE
+ ENABLE_SHUTDOWN_SYS to SHUTDOWN_SYS_ENABLE
+ Added MIXER_VOLUME_STEP to allow the mixer volume change to be specified
'''),
]
@@ -336,28 +346,25 @@
# 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/?
+
+MIXER_MAJOR_CTRL = 'VOL' # Freevo takes control over one audio ctrl
# 'VOL', 'PCM' 'OGAIN' etc.
-MAJOR_AUDIO_CTRL_MUTE = 'PCM' # used in alsamixer.py
- # There are systems where volume
- # and mute use different controls
-
-CONTROL_ALL_AUDIO = 1 # Should Freevo take complete control of
audio
-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.
+MIXER_MAJOR_MUTE_CTRL = 'PCM' # used in alsamixer.py, There are systems
where
+ # volume and mute use different controls
-VOLUME_MIXER_DEV = '/dev/mixer' # mixer device
-VOLUME_MIXER_STEP = 5 # Amount to increment the mixer volume
+MIXER_DEVICE = '/dev/mixer' # mixer device
+MIXER_CONTROL_ALL = 1 # Should Freevo take complete control of
audio
+MIXER_VOLUME_STEP = 5 # Amount to increment the mixer volume
+MIXER_VOLUME_MAX = 90 # Set what you want maximum volume level
to be.
+MIXER_VOLUME_DEFAULT = 40 # Set default volume level.
+MIXER_VOLUME_TV_IN = 60 # Set this to your preferred level 0-100.
+MIXER_VOLUME_VCR_IN = 90 # If you use different input from TV
+MIXER_VOLUME_RADIO_IN = 80 # Set this to your preferred level 0-100.
START_FULLSCREEN_X = 0 # Start in fullscreen mode if using x11
or xv.
-CONFIRM_SHUTDOWN = 1 # ask before shutdown
-
#
# Physical ROM drives, multiple ones can be specified
# by adding comma-seperated and quoted entries.
@@ -381,12 +388,14 @@
#
ROM_SPEED = 0
+CONFIRM_SHUTDOWN = 1 # ask before shutdown
+
SHUTDOWN_SYS_CMD = 'shutdown -h now' # set this to 'sudo shutdown -h now' if
- # you don't have the permissions to
- # shutdown
+ # you don't have the permissions to
shutdown
+
RESTART_SYS_CMD = 'shutdown -r now' # like SHUTDOWN_SYS_CMD, only for reboot
-ENABLE_SHUTDOWN_SYS = 0 # Performs a whole system shutdown at SHUTDOWN!
+SHUTDOWN_SYS_ENABLE = 0 # Performs a whole system shutdown at SHUTDOWN!
# For standalone boxes.
@@ -395,11 +404,11 @@
# ======================================================================
# replace the default shutdown plugin
-#plugin.remove('shutdown')
-#plugin.activate('autoshutdown', level=90)
+# plugin.remove('shutdown')
+# plugin.activate('autoshutdown', level=90)
# activate the timer
-#plugin.activate('autoshutdown.autoshutdowntimer')
+# plugin.activate('autoshutdown.autoshutdowntimer')
# -- autoshutdown menu item configuration --
Modified: branches/rel-1/freevo/howtomerge
==============================================================================
--- branches/rel-1/freevo/howtomerge (original)
+++ branches/rel-1/freevo/howtomerge Mon Oct 15 15:40:54 2007
@@ -1,13 +1,14 @@
#!/bin/bash
-last=9238
+last=9976
LAST=${1:-${last}}
cd /sources/svn/freevo-1.x/freevo
echo "last change is: ${LAST}"
-svn merge -r${LAST}:HEAD /sources/svn/freevo-1.6/ . --dry-run
+svn merge -r${LAST}:HEAD /home/duncan/rel-1.7.3/ . --dry-run
echo "press enter to do it"
read ENTER
-svn merge -r${LAST}:HEAD /sources/svn/freevo-1.6/ .
+#svn merge -r${LAST}:HEAD /sources/svn/freevo-1.6/ .
+svn merge -r${LAST}:HEAD /home/duncan/rel-1.7.3/ .
#svn export -r8215
svn://svn.freevo.org/freevo/branches/rel-1/freevo/src/video/plugins/xine.py x.py
#svn log --verbose --stop-on-copy
/sources/svn/freevo-1.6/src/www/htdocs/library.rpy
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 Mon Oct 15 15:40:54 2007
@@ -46,20 +46,19 @@
# 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
+# MIXER_MAJOR_CTRL = 'VOL' # Freevo takes control over one audio
ctrl
# 'VOL', 'PCM' 'OGAIN' etc.
-# MAJOR_AUDIO_CTRL_MUTE = 'PCM' # used in alsamixer.py
-# # There are systems where volume
-# # and mute use different controls
-
-# CONTROL_ALL_AUDIO = 1 # Should Freevo take complete control
of audio
-# 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.
-# VOLUME_MIXER_DEV = '/dev/mixer' # mixer device
+# MIXER_MAJOR_MUTE_CTRL = 'PCM' # used in alsamixer.py There are
systems where
+ # volume and mute use different
controls
+
+# MIXER_DEVICE = '/dev/mixer' # mixer device
+# MIXER_CONTROL_ALL = 1 # Should Freevo take complete control
of audio
+# MIXER_VOLUME_MAX = 90 # Set what you want maximum volume
level to be.
+# MIXER_VOLUME_DEFAULT = 40 # Set default volume level.
+# MIXER_VOLUME_TV_IN = 60 # Set this to your preferred level
0-100.
+# MIXER_VOLUME_VCR_IN = 90 # If you use different input from TV
+# MIXER_VOLUME_RADIO_IN = 80 # Set this to your preferred level
0-100.
# START_FULLSCREEN_X = 0 # Start in fullscreen mode if using x11
or xv.
@@ -91,7 +90,7 @@
#
# Perform a whole system shutdown at SHUTDOWN! Useful for standalone boxes.
#
-# ENABLE_SHUTDOWN_SYS = 0
+# SHUTDOWN_SYS_ENABLE = 0
#
# Command to execute to shutdown the system
#
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 Mon Oct 15
15:40:54 2007
@@ -94,7 +94,7 @@
mixer = plugin.getbyname('MIXER')
if mixer:
- mixer_vol = config.VOLUME_RADIO_IN
+ mixer_vol = config.MIXER_VOLUME_RADIO_IN
mixer.setLineinVolume(mixer_vol)
mixer.setIgainVolume(mixer_vol)
mixer.setMicVolume(mixer_vol)
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 Mon Oct 15 15:40:54 2007
@@ -87,14 +87,25 @@
'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',
- 'RADIO_IN_VOLUME': 'VOLUME_RADIO_IN',
- 'MAX_VOLUME': 'VOLUME_MAX',
- 'DEV_MIXER': 'VOLUME_MIXER_DEV',
- 'MIXER_DEFAULT_STEP': 'VOLUME_MIXER_STEP',
- }
+ 'DEFAULT_VOLUME': 'MIXER_VOLUME_DEFAULT',
+ 'TV_IN_VOLUME': 'MIXER_VOLUME_TV_IN',
+ 'VCR_IN_VOLUME': 'MIXER_VOLUME_VCR_IN',
+ 'RADIO_IN_VOLUME': 'MIXER_VOLUME_RADIO_IN',
+ 'MAX_VOLUME': 'MIXER_VOLUME_MAX',
+ 'DEV_MIXER': 'MIXER_DEVICE',
+ 'MIXER_DEFAULT_STEP': 'MIXER_VOLUME_STEP',
+ 'CONTROL_ALL_AUDIO': 'MIXER_CONTROL_ALL',
+ 'VOLUME_DEFAULT': 'MIXER_VOLUME_DEFAULT',
+ 'VOLUME_VCR_IN': 'MIXER_VOLUME_VCR_IN',
+ 'VOLUME_TV_IN': 'MIXER_VOLUME_TV_IN',
+ 'VOLUME_MIXER_STEP': 'MIXER_VOLUME_STEP',
+ 'VOLUME_RADIO_IN': 'MIXER_VOLUME_RADIO_IN',
+ 'VOLUME_MAX': 'MIXER_VOLUME_MAX',
+ 'VOLUME_MIXER_DEV': 'MIXER_DEVICE',
+ 'MAJOR_AUDIO_CTRL': 'MIXER_MAJOR_CTRL',
+ 'MAJOR_AUDIO_CTRL_MUTE': 'MIXER_MAJOR_MUTE_CTRL',
+ 'ENABLE_SHUTDOWN_SYS': 'SHUTDOWN_SYS_ENABLE',
+}
def help():
print 'convert local_conf.py to use the new variable names'
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 Mon Oct 15 15:40:54 2007
@@ -102,7 +102,7 @@
plugin.DaemonPlugin.__init__(self)
self.plugin_name = 'MIXER'
- self.default_step = config.VOLUME_MIXER_STEP
+ self.default_step = config.MIXER_VOLUME_STEP
self.mainVolume = 0
self.pcmVolume = 0
@@ -111,20 +111,20 @@
self.igainVolume = 0
self.ogainVolume = 0
- if config.MAJOR_AUDIO_CTRL == 'VOL':
- self.setMainVolume(config.VOLUME_DEFAULT)
- if config.CONTROL_ALL_AUDIO:
- self.setPcmVolume(config.VOLUME_MAX)
- self.setOgainVolume(config.VOLUME_MAX)
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
- self.setPcmVolume(config.VOLUME_DEFAULT)
- if config.CONTROL_ALL_AUDIO:
- self.setMainVolume(config.VOLUME_MAX)
- self.setOgainVolume(config.VOLUME_MAX)
+ if config.MIXER_MAJOR_CTRL == 'VOL':
+ self.setMainVolume(config.MIXER_VOLUME_DEFAULT)
+ if config.MIXER_CONTROL_ALL:
+ self.setPcmVolume(config.MIXER_VOLUME_MAX)
+ self.setOgainVolume(config.MIXER_VOLUME_MAX)
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
+ self.setPcmVolume(config.MIXER_VOLUME_DEFAULT)
+ if config.MIXER_CONTROL_ALL:
+ self.setMainVolume(config.MIXER_VOLUME_MAX)
+ self.setOgainVolume(config.MIXER_VOLUME_MAX)
else:
_debug_("No appropriate audio channel found for mixer")
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.setLineinVolume(0)
self.setMicVolume(0)
@@ -158,10 +158,10 @@
# Handle volume control
if event == MIXER_VOLUP:
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
self.incMainVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
self.incPcmVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
if config.ALSA_SYNCMIXER == 1:
@@ -169,10 +169,10 @@
return True
elif event == MIXER_VOLDOWN:
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
self.decMainVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
self.decPcmVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
if config.ALSA_SYNCMIXER == 1:
@@ -207,21 +207,21 @@
def setMuted(self, mute):
self.muted = mute
- if config.MAJOR_AUDIO_CTRL_MUTE == 'VOL':
+ if config.MIXER_MAJOR_CTRL_MUTE == 'VOL':
if mute == 1:
self.main_mixer.setmute(1)
else:
self.main_mixer.setmute(0)
- elif config.MAJOR_AUDIO_CTRL_MUTE == 'PCM':
+ elif config.MIXER_MAJOR_CTRL_MUTE == 'PCM':
if mute == 1:
self.pcm_mixer.setmute(1)
else:
self.pcm_mixer.setmute(0)
def getVolume(self):
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
return self.mainVolume
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
return self.pcmVolume
def getMainVolume(self):
@@ -266,7 +266,7 @@
self._setVolume(self.pcm_mixer, self.pcmVolume)
def setLineinVolume(self, volume):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.lineinVolume = volume
self._setVolume(self.line_mixer, volume)
@@ -274,12 +274,12 @@
return self.lineinVolume
def setMicVolume(self, volume):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.micVolume = volume
self._setVolume(self.mic_mixer, volume)
def setIgainVolume(self, volume):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
if volume > 100:
volume = 100
elif volume < 0:
@@ -310,12 +310,12 @@
#self._setVolume(ossaudiodev.SOUND_MIXER_IGAIN, volume)
def reset(self):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.setLineinVolume(0)
self.setMicVolume(0)
- if config.MAJOR_AUDIO_CTRL == 'VOL':
- self.setPcmVolume(config.VOLUME_DEFAULT)
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
- self.setMainVolume(config.VOLUME_DEFAULT)
+ if config.MIXER_MAJOR_CTRL == 'VOL':
+ self.setPcmVolume(config.MIXER_VOLUME_DEFAULT)
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
+ self.setMainVolume(config.MIXER_VOLUME_DEFAULT)
self.setIgainVolume(0) # SB Live input from TV Card.
Modified: branches/rel-1/freevo/src/plugins/autoshutdown.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/autoshutdown.py (original)
+++ branches/rel-1/freevo/src/plugins/autoshutdown.py Mon Oct 15 15:40:54 2007
@@ -82,7 +82,7 @@
plugin.activate('autoshutdown',level=90)
Configuration:
- ENABLE_SHUTDOWN_SYS = 1
+ SHUTDOWN_SYS_ENABLE = 1
AUTOSHUTDOWN_METHOD = 'acpi|nvram'
AUTOSHUTDOWN_WAKEUP_CMD = PATH/TO/THE/WAKEUP_SCRIPT
AUTOSHUTDOWN_DEFAULT_WAKEUP_TIME = "13:00"
Modified: branches/rel-1/freevo/src/plugins/freevused.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/freevused.py (original)
+++ branches/rel-1/freevo/src/plugins/freevused.py Mon Oct 15 15:40:54 2007
@@ -278,7 +278,7 @@
self.FVUSED_ITEM_INFO = em.Event('FVUSED_ITEM_INFO')
- self.mixer_default_step = config.VOLUME_MIXER_STEP
+ self.mixer_default_step = config.MIXER_VOLUME_STEP
thread.start_new_thread(self.bluetoothListener, ())
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 Mon Oct 15 15:40:54 2007
@@ -69,7 +69,7 @@
w = 0
if mixer:
muted = mixer.getMuted()
- vol = (float(mixer.getVolume())/float(config.VOLUME_MAX))
+ vol = (float(mixer.getVolume())/float(config.MIXER_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 Mon Oct 15 15:40:54 2007
@@ -65,17 +65,17 @@
# If you're using ALSA or something and you don't set the mixer,
# why are we trying to open it?
- if config.VOLUME_MIXER_DEV:
+ if config.MIXER_DEVICE:
try:
- self.mixfd = open(config.VOLUME_MIXER_DEV, 'r')
+ self.mixfd = open(config.MIXER_DEVICE, 'r')
except IOError:
- print 'Couldn\'t open mixer %s' % config.VOLUME_MIXER_DEV
+ print 'Couldn\'t open mixer %s' % config.MIXER_DEVICE
return
# init here
plugin.DaemonPlugin.__init__(self)
self.plugin_name = 'MIXER'
- self.default_step = config.VOLUME_MIXER_STEP
+ self.default_step = config.MIXER_VOLUME_STEP
if 0:
self.mainVolume = 0
@@ -93,24 +93,24 @@
_debug_('IOError for ioctl')
pass
- if config.MAJOR_AUDIO_CTRL == 'VOL':
- self.setMainVolume(config.VOLUME_DEFAULT)
- if config.CONTROL_ALL_AUDIO:
- self.setPcmVolume(config.VOLUME_MAX)
+ if config.MIXER_MAJOR_CTRL == 'VOL':
+ self.setMainVolume(config.MIXER_VOLUME_DEFAULT)
+ if config.MIXER_CONTROL_ALL:
+ self.setPcmVolume(config.MIXER_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.VOLUME_MAX)
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
- self.setPcmVolume(config.VOLUME_DEFAULT)
- if config.CONTROL_ALL_AUDIO:
- self.setMainVolume(config.VOLUME_MAX)
+ self.setOgainVolume(config.MIXER_VOLUME_MAX)
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
+ self.setPcmVolume(config.MIXER_VOLUME_DEFAULT)
+ if config.MIXER_CONTROL_ALL:
+ self.setMainVolume(config.MIXER_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.VOLUME_MAX)
+ self.setOgainVolume(config.MIXER_VOLUME_MAX)
else:
_debug_("No appropriate audio channel found for mixer")
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.setLineinVolume(0)
self.setMicVolume(0)
@@ -126,19 +126,19 @@
step = self.default_step
if event == MIXER_VOLUP:
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
self.incMainVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
self.incPcmVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
elif event == MIXER_VOLDOWN:
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
self.decMainVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
- elif( config.MAJOR_AUDIO_CTRL == 'PCM' ):
+ elif( config.MIXER_MAJOR_CTRL == 'PCM' ):
self.decPcmVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
@@ -175,21 +175,21 @@
def setMuted(self, mute):
self.muted = mute
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
if mute == 1:
self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, 0)
else:
self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
if mute == 1:
self._setVolume(self.SOUND_MIXER_WRITE_PCM, 0)
else:
self._setVolume(self.SOUND_MIXER_WRITE_PCM, self.pcmVolume)
def getVolume(self):
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
return self.mainVolume
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
return self.pcmVolume
def getMainVolume(self):
@@ -231,7 +231,7 @@
self._setVolume( self.SOUND_MIXER_WRITE_PCM, self.pcmVolume )
def setLineinVolume(self, volume):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.lineinVolume = volume
self._setVolume(self.SOUND_MIXER_WRITE_LINE, volume)
@@ -239,13 +239,13 @@
return self.lineinVolume
def setMicVolume(self, volume):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.micVolume = volume
self._setVolume(self.SOUND_MIXER_WRITE_MIC, volume)
def setIgainVolume(self, volume):
"""For Igain (input from TV etc) on emu10k cards"""
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
if volume > 100:
volume = 100
elif volume < 0:
@@ -278,12 +278,12 @@
os.system('aumix -o%s > /dev/null 2>&1' % volume)
def reset(self):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.setLineinVolume(0)
self.setMicVolume(0)
- if config.MAJOR_AUDIO_CTRL == 'VOL':
- self.setPcmVolume(config.VOLUME_MAX)
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
- self.setMainVolume(config.VOLUME_MAX)
+ if config.MIXER_MAJOR_CTRL == 'VOL':
+ self.setPcmVolume(config.MIXER_VOLUME_MAX)
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
+ self.setMainVolume(config.MIXER_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 Mon Oct 15 15:40:54 2007
@@ -76,18 +76,18 @@
# If you're using ALSA or something and you don't set the mixer,
# why are we trying to open it?
- if config.VOLUME_MIXER_DEV:
+ if config.MIXER_DEVICE:
try:
- self.mixfd = ossaudiodev.openmixer(config.VOLUME_MIXER_DEV)
+ self.mixfd = ossaudiodev.openmixer(config.MIXER_DEVICE)
except IOError:
- print 'Couldn\'t open mixer "%s"' % config.VOLUME_MIXER_DEV
+ print 'Couldn\'t open mixer "%s"' % config.MIXER_DEVICE
return
# init here
plugin.DaemonPlugin.__init__(self)
self.plugin_name = 'MIXER'
- self.default_step = config.VOLUME_MIXER_STEP
+ self.default_step = config.MIXER_VOLUME_STEP
if 0:
self.mainVolume = 0
@@ -97,20 +97,20 @@
self.igainVolume = 0
self.ogainVolume = 0
- if config.MAJOR_AUDIO_CTRL == 'VOL':
- self.setMainVolume(config.VOLUME_DEFAULT)
- if config.CONTROL_ALL_AUDIO:
- self.setPcmVolume(config.VOLUME_MAX)
- self.setOgainVolume(config.VOLUME_MAX)
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
- self.setPcmVolume(config.VOLUME_DEFAULT)
- if config.CONTROL_ALL_AUDIO:
- self.setMainVolume(config.VOLUME_MAX)
- self.setOgainVolume(config.VOLUME_MAX)
+ if config.MIXER_MAJOR_CTRL == 'VOL':
+ self.setMainVolume(config.MIXER_VOLUME_DEFAULT)
+ if config.MIXER_CONTROL_ALL:
+ self.setPcmVolume(config.MIXER_VOLUME_MAX)
+ self.setOgainVolume(config.MIXER_VOLUME_MAX)
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
+ self.setPcmVolume(config.MIXER_VOLUME_DEFAULT)
+ if config.MIXER_CONTROL_ALL:
+ self.setMainVolume(config.MIXER_VOLUME_MAX)
+ self.setOgainVolume(config.MIXER_VOLUME_MAX)
else:
_debug_("No appropriate audio channel found for mixer")
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.setLineinVolume(0)
self.setMicVolume(0)
@@ -127,19 +127,19 @@
# Handle volume control
if event == MIXER_VOLUP:
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
self.incMainVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
self.incPcmVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
elif event == MIXER_VOLDOWN:
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
self.decMainVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
self.decPcmVolume(step)
rc.post_event(Event(OSD_MESSAGE, arg=_('Volume: %s%%') %
self.getVolume()))
return True
@@ -170,21 +170,21 @@
def setMuted(self, mute):
self.muted = mute
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
if mute == 1:
self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, 0)
else:
self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME,
self.mainVolume)
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
if mute == 1:
self._setVolume(ossaudiodev.SOUND_MIXER_PCM, 0)
else:
self._setVolume(ossaudiodev.SOUND_MIXER_PCM, self.pcmVolume)
def getVolume(self):
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MIXER_MAJOR_CTRL == 'VOL':
return self.mainVolume
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
return self.pcmVolume
def getMainVolume(self):
@@ -226,7 +226,7 @@
self._setVolume( ossaudiodev.SOUND_MIXER_PCM, self.pcmVolume )
def setLineinVolume(self, volume):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.lineinVolume = volume
self._setVolume(ossaudiodev.SOUND_MIXER_LINE, volume)
@@ -234,12 +234,12 @@
return self.lineinVolume
def setMicVolume(self, volume):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.micVolume = volume
self._setVolume(ossaudiodev.SOUND_MIXER_MIC, volume)
def setIgainVolume(self, volume):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
if volume > 100:
volume = 100
elif volume < 0:
@@ -270,12 +270,12 @@
self._setVolume(ossaudiodev.SOUND_MIXER_IGAIN, volume)
def reset(self):
- if config.CONTROL_ALL_AUDIO:
+ if config.MIXER_CONTROL_ALL:
self.setLineinVolume(0)
self.setMicVolume(0)
- if config.MAJOR_AUDIO_CTRL == 'VOL':
- self.setPcmVolume(config.VOLUME_MAX)
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
- self.setMainVolume(config.VOLUME_MAX)
+ if config.MIXER_MAJOR_CTRL == 'VOL':
+ self.setPcmVolume(config.MIXER_VOLUME_MAX)
+ elif config.MIXER_MAJOR_CTRL == 'PCM':
+ self.setMainVolume(config.MIXER_VOLUME_MAX)
self.setIgainVolume(0) # SB Live input from TV Card.
Modified: branches/rel-1/freevo/src/plugins/shutdown.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/shutdown.py (original)
+++ branches/rel-1/freevo/src/plugins/shutdown.py Mon Oct 15 15:40:54 2007
@@ -139,7 +139,7 @@
items = [ (self.shutdown_freevo, _('Shutdown Freevo') ),
(self.shutdown_system, _('Shutdown system') ),
(self.shutdown_system_restart, _('Restart system') )
]
- if config.ENABLE_SHUTDOWN_SYS:
+ if config.SHUTDOWN_SYS_ENABLE:
items = [ items[1], items[0], items[2] ]
return items
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 Mon Oct 15
15:40:54 2007
@@ -73,11 +73,11 @@
if not config.TV_CHANNELS:
_debug_("TV_CHANNELS is not configured!")
-if not config.VOLUME_TV_IN:
- _debug_("VOLUME_TV_IN is not configured!")
+if not config.MIXER_VOLUME_TV_IN:
+ _debug_("MIXER_VOLUME_TV_IN is not configured!")
-if not config.MAJOR_AUDIO_CTRL:
- _debug_("MAJOR_AUDIO_CTRL is not configured!")
+if not config.MIXER_MAJOR_CTRL:
+ _debug_("MIXER_MAJOR_CTRL is not configured!")
if not config.XINE_COMMAND:
config.XINE_COMMAND = "xine"
@@ -113,8 +113,8 @@
The following items should be configured in local_conf.py:
- TV_CHANNELS
- - VOLUME_TV_IN
- - MAJOR_AUDIO_CTRL
+ - MIXER_VOLUME_TV_IN
+ - MIXER_MAJOR_CTRL
- XINE_COMMAND
- XINE_ARGS_DEF
- XINE_TV_VO_DEV
@@ -510,12 +510,12 @@
if (self.mixer != None):
- if config.MAJOR_AUDIO_CTRL == "VOL":
+ if config.MIXER_MAJOR_CTRL == "VOL":
self.volume = self.mixer.getMainVolume()
self.mixer.setMainVolume(0)
- elif config.MAJOR_AUDIO_CTRL == "PCM":
+ elif config.MIXER_MAJOR_CTRL == "PCM":
self.volume = self.mixer.getPcmVolume()
self.mixer.setPcmVolume(0)
@@ -525,14 +525,14 @@
if (self.mixer != None):
- self.mixer.setLineinVolume(config.VOLUME_TV_IN)
- self.mixer.setIgainVolume(config.VOLUME_TV_IN)
+ self.mixer.setLineinVolume(config.MIXER_VOLUME_TV_IN)
+ self.mixer.setIgainVolume(config.MIXER_VOLUME_TV_IN)
- if config.MAJOR_AUDIO_CTRL == "VOL":
+ if config.MIXER_MAJOR_CTRL == "VOL":
self.mixer.setMainVolume(self.volume)
- elif config.MAJOR_AUDIO_CTRL == "PCM":
+ elif config.MIXER_MAJOR_CTRL == "PCM":
self.mixer.setPcmVolume(self.volume)
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 Mon Oct 15 15:40:54 2007
@@ -181,10 +181,10 @@
# btaudio (different dsp device) will be added later
mixer = plugin.getbyname('MIXER')
- if mixer and config.MAJOR_AUDIO_CTRL == 'VOL':
+ if mixer and config.MIXER_MAJOR_CTRL == 'VOL':
mixer_vol = mixer.getMainVolume()
mixer.setMainVolume(0)
- elif mixer and config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif mixer and config.MIXER_MAJOR_CTRL == 'PCM':
mixer_vol = mixer.getPcmVolume()
mixer.setPcmVolume(0)
@@ -201,14 +201,14 @@
time.sleep(0.4)
# XXX Hm.. This is hardcoded and very unflexible.
if mixer and mode == 'vcr':
- mixer.setMicVolume(config.VOLUME_VCR_IN)
+ mixer.setMicVolume(config.MIXER_VOLUME_VCR_IN)
elif mixer:
- mixer.setLineinVolume(config.VOLUME_TV_IN)
- mixer.setIgainVolume(config.VOLUME_TV_IN)
+ mixer.setLineinVolume(config.MIXER_VOLUME_TV_IN)
+ mixer.setIgainVolume(config.MIXER_VOLUME_TV_IN)
- if mixer and config.MAJOR_AUDIO_CTRL == 'VOL':
+ if mixer and config.MIXER_MAJOR_CTRL == 'VOL':
mixer.setMainVolume(mixer_vol)
- elif mixer and config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif mixer and config.MIXER_MAJOR_CTRL == 'PCM':
mixer.setPcmVolume(mixer_vol)
_debug_('%s: started %s app' % (time.time(), self.mode))
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 Mon Oct 15 15:40:54 2007
@@ -458,10 +458,10 @@
# TV is on line in
# VCR is mic in
# btaudio (different dsp device) will be added later
- if mixer and config.MAJOR_AUDIO_CTRL == 'VOL':
+ if mixer and config.MIXER_MAJOR_CTRL == 'VOL':
mixer_vol = mixer.getMainVolume()
mixer.setMainVolume(0)
- elif mixer and config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif mixer and config.MIXER_MAJOR_CTRL == 'PCM':
mixer_vol = mixer.getPcmVolume()
mixer.setPcmVolume(0)
@@ -475,14 +475,14 @@
time.sleep(0.4)
# BUG Hm.. This is hardcoded and very unflexible.
if mixer and mode == 'vcr':
- mixer.setMicVolume(config.VOLUME_VCR_IN)
+ mixer.setMicVolume(config.MIXER_VOLUME_VCR_IN)
elif mixer:
- mixer.setLineinVolume(config.VOLUME_TV_IN)
- mixer.setIgainVolume(config.VOLUME_TV_IN)
+ mixer.setLineinVolume(config.MIXER_VOLUME_TV_IN)
+ mixer.setIgainVolume(config.MIXER_VOLUME_TV_IN)
- if mixer and config.MAJOR_AUDIO_CTRL == 'VOL':
+ if mixer and config.MIXER_MAJOR_CTRL == 'VOL':
mixer.setMainVolume(mixer_vol)
- elif mixer and config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif mixer and config.MIXER_MAJOR_CTRL == 'PCM':
mixer.setPcmVolume(mixer_vol)
_debug_('%s: started %s app' % (time.time(), self.mode))
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 Mon Oct 15 15:40:54 2007
@@ -174,10 +174,10 @@
# TV is on line in
# VCR is mic in
# btaudio (different dsp device) will be added later
- if mixer and config.MAJOR_AUDIO_CTRL == 'VOL':
+ if mixer and config.MIXER_MAJOR_CTRL == 'VOL':
mixer_vol = mixer.getMainVolume()
mixer.setMainVolume(0)
- elif mixer and config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif mixer and config.MIXER_MAJOR_CTRL == 'PCM':
mixer_vol = mixer.getPcmVolume()
mixer.setPcmVolume(0)
@@ -196,14 +196,14 @@
time.sleep(0.4)
# BUG Hm.. This is hardcoded and very unflexible.
if mixer and mode == 'vcr':
- mixer.setMicVolume(config.VOLUME_VCR_IN)
+ mixer.setMicVolume(config.MIXER_VOLUME_VCR_IN)
elif mixer:
- mixer.setLineinVolume(config.VOLUME_TV_IN)
- mixer.setIgainVolume(config.VOLUME_TV_IN)
+ mixer.setLineinVolume(config.MIXER_VOLUME_TV_IN)
+ mixer.setIgainVolume(config.MIXER_VOLUME_TV_IN)
- if mixer and config.MAJOR_AUDIO_CTRL == 'VOL':
+ if mixer and config.MIXER_MAJOR_CTRL == 'VOL':
mixer.setMainVolume(mixer_vol)
- elif mixer and config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif mixer and config.MIXER_MAJOR_CTRL == 'PCM':
mixer.setPcmVolume(mixer_vol)
_debug_('%s: started %s app' % (time.time(), self.mode))
-------------------------------------------------------------------------
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
