Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2007-09-24 16:00:36 (GMT)
committer Simon Schampijer <simon@schampijer.de>2007-09-24 16:00:36 (GMT)
commite3f97b042f2ffddcef8d10ae6d9bd3cb4f6c19c1 (patch)
tree57b3abd1356026e35d6aed6f02d54909ce394d2a
parent0a53813064890877a52e2bf392eb4d1dbfbb0a3c (diff)
Save state of volume when shutdown and reboot fix for #3652
-rw-r--r--NEWS1
-rw-r--r--shell/hardware/hardwaremanager.py13
-rwxr-xr-xshell/sugar-shell3
-rw-r--r--shell/view/home/HomeBox.py7
-rw-r--r--sugar/profile.py7
5 files changed, 31 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index d0e6c81..e9c0a34 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+* #3652 Save state of volume when shutdown (erikos)
* #3378 Support changes in activity scope (incomplete!) (smcv, marco)
* #3081, #3497, #3485 Fix palette sizing and widget placement (benzea)
* #2211 New XRestop interface style in Developer Console (edsiper)
diff --git a/shell/hardware/hardwaremanager.py b/shell/hardware/hardwaremanager.py
index 5a85707..79b932f 100644
--- a/shell/hardware/hardwaremanager.py
+++ b/shell/hardware/hardwaremanager.py
@@ -21,6 +21,8 @@ import gst
import gst.interfaces
from hardware.nmclient import NMClient
+from sugar.profile import get_profile
+from sugar import env
_HARDWARE_MANAGER_INTERFACE = 'org.laptop.HardwareManager'
_HARDWARE_MANAGER_SERVICE = 'org.laptop.HardwareManager'
@@ -80,6 +82,17 @@ class HardwareManager(object):
logging.error('Cannot mute the audio channel')
self._mixer.set_mute(self._master, mute)
+ def startup(self):
+ if env.is_emulator() is False:
+ profile = get_profile()
+ self.set_volume(profile.sound_volume)
+
+ def shutdown(self):
+ if env.is_emulator() is False:
+ profile = get_profile()
+ profile.sound_volume = self.get_volume()
+ profile.save()
+
def set_dcon_freeze(self, frozen):
if not self._service:
return
diff --git a/shell/sugar-shell b/shell/sugar-shell
index 93f2faa..106a9d7 100755
--- a/shell/sugar-shell
+++ b/shell/sugar-shell
@@ -147,6 +147,9 @@ if __name__ == '__main__':
main()
+ hw_manager = hardwaremanager.get_manager()
+ hw_manager.startup()
+
try:
gtk.main()
except KeyboardInterrupt:
diff --git a/shell/view/home/HomeBox.py b/shell/view/home/HomeBox.py
index 82fa083..7cdb2cb 100644
--- a/shell/view/home/HomeBox.py
+++ b/shell/view/home/HomeBox.py
@@ -24,6 +24,7 @@ import gtk
import hippo
import dbus
+from hardware import hardwaremanager
from sugar.graphics import style
from sugar.graphics.xocolor import XoColor
from sugar.graphics.palette import Palette, CanvasInvoker
@@ -169,6 +170,9 @@ class HomeMyIcon(MyIcon):
pm = self._get_power_manager()
+ hw_manager = hardwaremanager.get_manager()
+ hw_manager.shutdown()
+
if env.is_emulator():
self._close_emulator()
else:
@@ -180,6 +184,9 @@ class HomeMyIcon(MyIcon):
pm = self._get_power_manager()
+ hw_manager = hardwaremanager.get_manager()
+ hw_manager.shutdown()
+
if env.is_emulator():
self._close_emulator()
else:
diff --git a/sugar/profile.py b/sugar/profile.py
index b0dc8d3..06084b7 100644
--- a/sugar/profile.py
+++ b/sugar/profile.py
@@ -25,6 +25,7 @@ from sugar import util
from sugar.graphics.xocolor import XoColor
DEFAULT_JABBER_SERVER = 'olpc.collabora.co.uk'
+DEFAULT_VOLUME = 81
_profile = None
@@ -93,6 +94,8 @@ class Profile(object):
_set_key(cp, 'Jabber', 'Registered', self.jabber_registered)
+ _set_key(cp, 'Sound', 'Volume', self.sound_volume)
+
f = open(self._config_path, 'w')
cp.write(f)
f.close()
@@ -115,6 +118,10 @@ class Profile(object):
self.jabber_registered = True
if cp.has_option('Server', 'Backup1'):
self.backup1 = cp.get('Server', 'Backup1')
+ if cp.has_option('Sound', 'Volume'):
+ self.sound_volume = float(cp.get('Sound', 'Volume'))
+ else:
+ self.sound_volume = DEFAULT_VOLUME
del cp