From e3f97b042f2ffddcef8d10ae6d9bd3cb4f6c19c1 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Mon, 24 Sep 2007 18:00:36 +0200
Subject: [PATCH] Save state of volume when shutdown and reboot fix for #3652

---
 NEWS                              |  1 +
 shell/hardware/hardwaremanager.py | 13 +++++++++++++
 shell/sugar-shell                 |  3 +++
 shell/view/home/HomeBox.py        |  7 +++++++
 sugar/profile.py                  |  7 +++++++
 5 files changed, 31 insertions(+)

diff --git a/NEWS b/NEWS
index d0e6c81e..e9c0a347 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 5a85707b..79b932f2 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 93f2faaa..106a9d71 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 82fa083d..7cdb2cb2 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 b0dc8d3a..06084b7a 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