Author: duncan
Date: Tue Jan 9 18:26:24 2007
New Revision: 8955
Modified:
branches/rel-1/freevo/src/plugins/mixer.py
branches/rel-1/freevo/src/plugins/ossmixer.py
Log:
[ 1631627 ] Mute doesn't work with MAJOR_AUDIO_CTRL = 'PCM'
Patch from Frank Naude applied
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 Tue Jan 9 18:26:24 2007
@@ -163,10 +163,16 @@
def setMuted(self, mute):
self.muted = mute
- if mute == 1:
- self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, 0)
- else:
- self._setVolume(self.SOUND_MIXER_WRITE_VOLUME, self.mainVolume)
+ if config.MAJOR_AUDIO_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':
+ 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':
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 Tue Jan 9 18:26:24 2007
@@ -152,10 +152,16 @@
def setMuted(self, mute):
self.muted = mute
- if mute == 1:
- self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, 0)
- else:
- self._setVolume(ossaudiodev.SOUND_MIXER_VOLUME, self.mainVolume)
+ if config.MAJOR_AUDIO_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':
+ 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':
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
