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

3 files changed, 5 insertions, 6 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:
diff --git a/src/model/devices/devicesmodel.py b/src/model/devices/devicesmodel.py
index 3a83c9d..f328109 100644
--- a/src/model/devices/devicesmodel.py
+++ b/src/model/devices/devicesmodel.py
@@ -18,7 +18,6 @@
 import logging
 import gobject
 import dbus
-import traceback
 
 from model.devices import device
 from model.devices.network import wireless
@@ -52,7 +51,6 @@ class DevicesModel(gobject.GObject):
         except Exception, speaker_fail_msg:
             logging.error("could not initialize speaker device: %s" %
                           speaker_fail_msg)
-            logging.debug(traceback.format_exc())
 
     def _observe_hal_manager(self):
         bus = dbus.Bus(dbus.Bus.TYPE_SYSTEM)
diff --git a/src/model/devices/speaker.py b/src/model/devices/speaker.py
index 8526ea3..683849d 100644
--- a/src/model/devices/speaker.py
+++ b/src/model/devices/speaker.py
@@ -40,7 +40,7 @@ class Device(device.Device):
         return self._manager.get_muted()
 
     def _set_muted(self, mute):
-        self._manager.set_mute(mute)
+        self._manager.set_muted(mute)
         self.notify('muted')
 
     def get_type(self):