diff options
author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-12-05 05:30:38 (GMT) |
---|---|---|
committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-12-05 05:30:38 (GMT) |
commit | c9e5ec50ca924a9ae95e4ba9a2f54480c024bcdc (patch) | |
tree | a0cb528bd41b4630966674135609000d37096e03 /plugins/audio_sensors/audiograb.py | |
parent | 92b7c1f3af8146cf16b0cbb6472844a0f383c4a7 (diff) | |
parent | d4e6a83b70e896868ab4c7ca8d178a2932abdfa7 (diff) |
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
Diffstat (limited to 'plugins/audio_sensors/audiograb.py')
-rw-r--r-- | plugins/audio_sensors/audiograb.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/audio_sensors/audiograb.py b/plugins/audio_sensors/audiograb.py index 6072c61..37efa53 100644 --- a/plugins/audio_sensors/audiograb.py +++ b/plugins/audio_sensors/audiograb.py @@ -154,6 +154,7 @@ class AudioGrab(): 'dc input bias', 'v_refout']) self._mic_boost_control = self._find_control(['mic boost', + 'mic1 boost', 'mic boost (+20db)', 'internal mic boost', 'analog mic boost']) @@ -525,18 +526,17 @@ class AudioGrab(): if self._labels_available: if self._mic_boost_control is None: return - # If there is a flag property, use set_mute - if self._mic_boost_control not in self._mixer.list_tracks() or \ + # If there is a volume, use set volume + if hasattr(self._mic_boost_control, 'min_volume'): + if mic_boost: + self._set_volume(self._mic_boost_control, 'boost', 100) + else: + self._set_volume(self._mic_boost_control, 'boost', 0) + # Else if there is a flag property, use set_mute + elif self._mic_boost_control not in self._mixer.list_tracks() or \ hasattr(self._mic_boost_control.props, 'flags'): self._set_mute( self._mic_boost_control, 'Mic Boost', not mic_boost) - # Otherwise, set volume to max or min value - elif mic_boost: - self._mixer.set_volume(self._mic_boost_control, - self._mic_boost_control.max_volume) - else: - self._mixer.set_volume(self._mic_boost_control, - self._mic_boost_control.min_volume) else: self.amixer_set('Mic Boost (+20dB)', mic_boost) |