Author: duncan
Date: Sun May 13 08:15:49 2007
New Revision: 9566
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/local_conf.py.example
branches/rel-1/freevo/src/plugins/alsamixer.py
Log:
[ 1717659 ] Alsamixer choose mute control
Patch from Gorka Olaizola applied
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Sun May 13 08:15:49 2007
@@ -18,6 +18,7 @@
* Updated Catalan translation (F#1709740)
* Updated mplayer to allow multiple crop points (F#1712397)
+ * Fixed alsamixer choose mute control (B#1717659)
* Fixed recordserver failing to record consecutive shows (B#1715260)
* Fixed rss feed not correctly writing the fxd file (B#1710553)
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Sun May 13 08:15:49 2007
@@ -267,6 +267,7 @@
'''Changed rss.feeds field separator to use a ';' instead of a ','
Changed weather locations to add a language code as the third parameter
Moved video.reencode to video.reencode-old and video.reencode2 to
video.reencode
+ Added MAJOR_AUDIO_CTRL_MUTE to be able to choose a differente control for
mute in the Alsa mixer plugin
''' ),
]
@@ -298,6 +299,10 @@
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.
+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
MAX_VOLUME = 90 # Set what you want maximum volume level
to be.
DEFAULT_VOLUME = 40 # Set default volume level.
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 Sun May 13 08:15:49 2007
@@ -51,6 +51,11 @@
# 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.
+
+# 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
# MAX_VOLUME = 90 # Set what you want maximum volume
level to be.
# DEFAULT_VOLUME = 40 # Set default volume level.
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 Sun May 13 08:15:49 2007
@@ -185,12 +185,12 @@
def setMuted(self, mute):
self.muted = mute
- if config.MAJOR_AUDIO_CTRL == 'VOL':
+ if config.MAJOR_AUDIO_CTRL_MUTE == 'VOL':
if mute == 1:
self.main_mixer.setmute(1)
else:
self.main_mixer.setmute(0)
- elif config.MAJOR_AUDIO_CTRL == 'PCM':
+ elif config.MAJOR_AUDIO_CTRL_MUTE == 'PCM':
if mute == 1:
self.pcm_mixer.setmute(1)
else:
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
