Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/hardware
diff options
context:
space:
mode:
authorMartin Dengler <martin@martindengler.com>2008-06-04 02:43:59 (GMT)
committer Martin Dengler <martin@martindengler.com>2008-06-10 08:06:53 (GMT)
commit550aa20e5f2672c1f47f07fdd47ece9e1dcf1d16 (patch)
treeaca5d5ba2aba34bf2fa952cd4282a926ceb7c63d /src/hardware
parentb05f3a82a2c088bc677c40d506eb86d3c9b7f450 (diff)
speaker-icon tidyups
- set_mute --> set_muted, consistent with get_muted() - return 0, not None, if we can't get the mixer volume - removed overly-verbose traceback printing in devicesmodel.py
Diffstat (limited to 'src/hardware')
-rw-r--r--src/hardware/hardwaremanager.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/hardware/hardwaremanager.py b/src/hardware/hardwaremanager.py
index 87d79c1..2f92537 100644
--- a/src/hardware/hardwaremanager.py
+++ b/src/hardware/hardwaremanager.py
@@ -60,7 +60,7 @@ class HardwareManager(object):
def get_volume(self):
if not self._mixer or not self._master:
logging.error('Cannot get the volume')
- return None
+ return 0
max_volume = self._master.max_volume
min_volume = self._master.min_volume
@@ -103,10 +103,11 @@ class HardwareManager(object):
last_volumes_read = self._mixer.get_volume(self._master)
read_count += 1
- def set_mute(self, mute):
+ def set_muted(self, mute):
if not self._mixer or not self._master:
logging.error('Cannot mute the audio channel')
- self._mixer.set_mute(self._master, mute)
+ else:
+ self._mixer.set_mute(self._master, mute)
def startup(self):
if env.is_emulator() is False: