Merge lp:~dylanmccall/indicator-sound/notifications-use-new-volume into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Dylan McCall]

This fixes the issue in bug #748831. Further pixel counting revealed that the issue was not the entire notification, but the icon selected for the notification. sound_state_manager_show_notification was calling a function that returned the _current_ SoundState in order to choose a notification, but the function itself is called before the sound state changes. (From the looks of it, that is unavoidable without some deep changes).

The only reason for calling this function is to figure out which of the four sound levels the volume fits in. So, I split the code to get a SoundState object from the volume into its own function (sound_state_get_from_volume), called by sound_state_manager_show_notification and device_get_state_from_volume.

The notification function seems to already make the assumption that it isn't going to be called for anything with SoundState == UNAVAILABLE, so I'm sticking to that assumption here.

I couldn't find a particularly nice place to put the new sound_state function, so I made a new pair of source files: sound-state.c and sound-state.h.

While I was at it, I happened to change the function to use the notification-audio-volume-* icons instead of just the audio-volume-* ones. This has no visible change with the existing icon themes, but it lines us up with gnome-settings-daemon, which uses those.

[Conor Curran (cjcurran)]

Looks good to me ! Thanks Dylan

review: Approve

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-03-17 16:10:03 +0000
+++ src/Makefile.am	2011-04-05 03:33:00 +0000
@@ -10,6 +10,8 @@
             common-defs.h \
             indicator-sound.h \
             indicator-sound.c \
+            sound-state.c \
+            sound-state.h \
             sound-state-manager.c \
             sound-state-manager.h \
             transport-widget.c \
@@ -90,6 +92,8 @@
   common-defs.h \
   sound-service.h \
   sound-service.c \
+  sound-state.c \
+  sound-state.h \
   pulseaudio-mgr.h \
   pulseaudio-mgr.c \
   device.c \

=== modified file 'src/device.c'
--- src/device.c	2011-03-15 15:23:09 +0000
+++ src/device.c	2011-04-05 03:33:00 +0000
@@ -23,6 +23,7 @@
 #include "mute-menu-item.h"
 #include "voip-input-menu-item.h"
 #include "pulseaudio-mgr.h"
+#include "sound-state.h"
 
 typedef struct _DevicePrivate DevicePrivate;
 
@@ -164,21 +165,7 @@
                                                         DBUSMENU_VOLUME_MENUITEM_LEVEL);
   gdouble volume_percent = g_variant_get_double (v);
 
-  SoundState state = LOW_LEVEL;
-
-  if (volume_percent < 30.0 && volume_percent > 0) {
-    state = LOW_LEVEL;
-  } 
-  else if (volume_percent < 70.0 && volume_percent >= 30.0) {
-    state = MEDIUM_LEVEL;
-  } 
-  else if (volume_percent >= 70.0) {
-    state = HIGH_LEVEL;
-  } 
-  else if (volume_percent == 0.0) {
-    state = ZERO_LEVEL;
-  }
-  return state;
+  return sound_state_get_from_volume ((int)volume_percent);
 }
 
 void

=== modified file 'src/sound-state-manager.c'
--- src/sound-state-manager.c	2011-03-05 20:27:39 +0000
+++ src/sound-state-manager.c	2011-04-05 03:33:00 +0000
@@ -24,6 +24,7 @@
 
 #include "sound-state-manager.h"
 #include "dbus-shared-names.h"
+#include "sound-state.h"
 
 typedef struct _SoundStateManagerPrivate SoundStateManagerPrivate;
 
@@ -170,19 +171,20 @@
 
   char *icon;
   const int notify_value = CLAMP((int)value, -1, 101);
-  SoundState state = sound_state_manager_get_current_state (self);
+  
+  SoundState state = sound_state_get_from_volume ((int)value);
       
   if (state == ZERO_LEVEL) {
     // Not available for all the themes
-    icon = "audio-volume-off";
+    icon = "notification-audio-volume-off";
   } else if (state == LOW_LEVEL) {
-    icon = "audio-volume-low";
+    icon = "notification-audio-volume-low";
   } else if (state == MEDIUM_LEVEL) {
-    icon = "audio-volume-medium";
+    icon = "notification-audio-volume-medium";
   } else if (state == HIGH_LEVEL) {
-    icon = "audio-volume-high";
+    icon = "notification-audio-volume-high";
   } else {
-    icon = "audio-volume-muted";
+    icon = "notification-audio-volume-muted";
   }
 
   notify_notification_update(priv->notification, PACKAGE_NAME, NULL, icon);

=== added file 'src/sound-state.c'
--- src/sound-state.c	1970-01-01 00:00:00 +0000
+++ src/sound-state.c	2011-04-05 03:33:00 +0000
@@ -0,0 +1,43 @@
+/*
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Conor Curran <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "config.h"
+
+#include "sound-state.h"
+
+SoundState
+sound_state_get_from_volume (int volume_percent)
+{
+  SoundState state = LOW_LEVEL;
+  
+  if (volume_percent < 30 && volume_percent > 0) {
+    state = LOW_LEVEL;
+  } 
+  else if (volume_percent < 70 && volume_percent >= 30) {
+    state = MEDIUM_LEVEL;
+  } 
+  else if (volume_percent >= 70) {
+    state = HIGH_LEVEL;
+  } 
+  else if (volume_percent <= 0) {
+    state = ZERO_LEVEL;
+  }
+  return state;
+}
+

=== added file 'src/sound-state.h'
--- src/sound-state.h	1970-01-01 00:00:00 +0000
+++ src/sound-state.h	2011-04-05 03:33:00 +0000
@@ -0,0 +1,31 @@
+/*
+Copyright 2011 Canonical Ltd.
+
+Authors:
+    Conor Curran <[e-mail]>
+
+This program is free software: you can redistribute it and/or modify it
+under the terms of the GNU General Public License version 3, as published
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranties of
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef _SOUND_STATE_H_
+#define _SOUND_STATE_H_
+
+#include <glib.h>
+#include "common-defs.h"
+
+/* Helper functions for determining SOUNDSTATE */
+
+SoundState sound_state_get_from_volume (int volume_percent);
+
+#endif /* _SOUND_STATE_H_ */
+