diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/hardware/hardwaremanager.py | 7 | ||||
| -rw-r--r-- | src/model/devices/devicesmodel.py | 2 | ||||
| -rw-r--r-- | src/model/devices/speaker.py | 2 | ||||
| -rw-r--r-- | src/session.py | 2 | ||||
| -rw-r--r-- | src/view/home/activitiesring.py | 4 |
5 files changed, 7 insertions, 10 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): diff --git a/src/session.py b/src/session.py index 94b105c..f0f7b8e 100644 --- a/src/session.py +++ b/src/session.py @@ -16,6 +16,8 @@ import gtk import dbus +import os +import signal from sugar import session from sugar import env diff --git a/src/view/home/activitiesring.py b/src/view/home/activitiesring.py index 394d31a..dccb066 100644 --- a/src/view/home/activitiesring.py +++ b/src/view/home/activitiesring.py @@ -15,23 +15,19 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -import os import logging -import signal from gettext import gettext as _ import math import gobject import gtk import hippo -import dbus from sugar.graphics import style from sugar.graphics.palette import Palette from sugar.graphics.icon import Icon, CanvasIcon from sugar.graphics.menuitem import MenuItem from sugar.profile import get_profile -from sugar import env from sugar import activity import view.Shell |