Merge lp:~ctf/unity-settings-daemon/bug1389099_mic_volume_icons into lp:ubuntu/trusty/unity-settings-daemon

[TienFu Chen]

added microphone volume icons support.

[Robert Ancell (robert-ancell)]

Looks good, thanks!

review: Approve

[Robert Ancell (robert-ancell)]

Actually, it appears this was already solved?

Unmerged revisions

15. By TienFu Chen on 2014-11-05

added mic volume icons

=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c	2014-03-10 17:25:56 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c	2014-11-05 08:25:10 +0000
@@ -210,6 +210,7 @@
 
         /* Ubuntu notifications */
         NotifyNotification *volume_notification;
+        NotifyNotification *mic_volume_notification;
         NotifyNotification *brightness_notification;
         NotifyNotification *kb_backlight_notification;
 
@@ -257,6 +258,12 @@
         NULL
 };
 
+static const char *mic_volume_icons[] = {
+        "notification-audio-input-microphone-low-zero",
+        "notification-audio-input-microphone-high",
+        NULL
+};
+
 static const char *brightness_icons[] = {
         "notification-display-brightness-off",
 	"notification-display-brightness-low",
@@ -350,6 +357,15 @@
 }
 
 static gboolean
+ubuntu_osd_notification_show_mic_volume (GsdMediaKeysManager *manager,
+                                     gint value,
+                                     gboolean muted)
+{
+        return ubuntu_osd_do_notification (&manager->priv->mic_volume_notification,
+                                           "mic-volume", value, muted, mic_volume_icons);
+}
+
+static gboolean
 ubuntu_osd_notification_show_brightness (GsdMediaKeysManager *manager,
                                          gint value)
 {
@@ -1337,8 +1353,13 @@
         const GvcMixerStreamPort *port;
         const char *icon;
 
-        if (ubuntu_osd_notification_show_volume (manager, vol, muted))
-                goto done;
+        if (GVC_IS_MIXER_SINK (stream)) {
+            if (ubuntu_osd_notification_show_volume (manager, vol, muted))
+                goto done;
+        } else {
+            if (ubuntu_osd_notification_show_mic_volume (manager, vol, muted))
+                goto done;
+        }
 
         vol = CLAMP (vol, 0, 100);
 
@@ -3115,6 +3136,12 @@
                 priv->volume_notification = NULL;
         }
 
+        if (priv->mic_volume_notification != NULL) {
+                notify_notification_close (priv->mic_volume_notification, NULL);
+                g_object_unref (priv->mic_volume_notification);
+                priv->mic_volume_notification = NULL;
+        }
+
         if (priv->brightness_notification != NULL) {
                 notify_notification_close (priv->brightness_notification, NULL);
                 g_object_unref (priv->brightness_notification);