Merge lp:~hui.wang/unity-settings-daemon/unity-settings-daemon into lp:unity-settings-daemon

[Hui Wang]

show correct microphone mute icon

We found a problem on the ubuntu 14.04 (trusty), and we think this problem exists on 14.10 and 15.04 as well.

The problem is when we press microphone mute hotkey, the OSD shows a speaker mute icon instead of microphone mute.

the tracking bug for this problem is: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1381856

[Hui Wang (hui.wang)]

Forgot to mention, the microphone icons I used in the patch was installed by this package: gnome-icon-theme-symbolic.

Those icons will be installed by default and already be used in the gsd-media-keys-manager.c, so it is safe to use it again in this file.

[Sebastien Bacher (seb128)]

Thanks for the work, Ccing David who knows that code a bit better than me

David, could you comment on whether "GVC_IS_MIXER_SINK (stream)" is the right way to check if the right way to tell a mic appart from an output?

[David Henningsson (diwic)]

> David, could you comment on whether "GVC_IS_MIXER_SINK (stream)" is the right way to check if the right way to tell a mic appart from an output?

I suppose so, since it is already used that way a few lines down.

In short, assuming Hui has properly tested his patch, I see no problems with it.

Nitpick: perhaps get_icon_name_for_volume can now be refactored to use the global definitions of "icon_names" and "mic_icon_names" instead of copy-pasted local ones.

review: Approve

[Hui Wang (hui.wang)]

I have tested my patch on the machine whith the trusty installed. It worked very well.

And about the Nitpick mentioned by David, if you want me to do the change, just let me know. Or probably you can do the change by yourself when you merge it.

[Sebastien Bacher (seb128)]

Hui, could you do the nitpick change? we can as well fix that before merging in. thanks!

[lp:~hui.wang/unity-settings-daemon/unity-settings-daemon]

4061. By Hui Wang on 2014-12-03

change to use global variables in the get_icon_name_for_volume

[Hui Wang (hui.wang)]

Done, the commit 4061 is for nitpick.

[Anthony Wong (anthonywong)]

Seb, we need this fix for oem projects, could you review this patch at your earliest convenience?

[Sebastien Bacher (seb128)]

Sorry for the delay due to holidays, the change looks fine indeed

review: Approve

[Hui Wang (hui.wang)]

Hi Sebastien,

Is it possible to merge this fix to Trusty, we have an OEM bug #1389099
still waiting this fix to be merged to Trusty, if you need me to do
something, please let me know.

Regards,
Hui.

On 01/08/2015 12:54 AM, Sebastien Bacher wrote:
> The proposal to merge lp:~hui.wang/unity-settings-daemon/unity-settings-daemon into lp:unity-settings-daemon has been updated.
>
> Commit Message changed to:
>
> show correct microphone mute icon
>
> For more details, see:
> https://code.launchpad.net/~hui.wang/unity-settings-daemon/unity-settings-daemon/+merge/240807

[Sebastien Bacher (seb128)]

Le 13/01/2015 03:16, Hui Wang a écrit :
> Hi Sebastien,
>
> Is it possible to merge this fix to Trusty,

Hey Hui,

Yes, I was waiting to get some feedback from the upload to vivid, I'm
going to SRU it next

Cheers,
Sebastien Bacher

[Hui Wang (hui.wang)]

Got it, thanks.

On 01/14/2015 10:08 PM, Sebastien Bacher wrote:
> Le 13/01/2015 03:16, Hui Wang a écrit :
>> Hi Sebastien,
>>
>> Is it possible to merge this fix to Trusty,
> Hey Hui,
>
> Yes, I was waiting to get some feedback from the upload to vivid, I'm
> going to SRU it next
>
> Cheers,
> Sebastien Bacher
>

[Hui Wang (hui.wang)]

Hello Sebastien,

Our OEM project has been waiting this fix to be merged to Trusty (14.04)
, is it possible we do that now? If you need me to do something, just
let me know.

Thanks,
Hui.

On 01/14/2015 10:09 PM, Sebastien Bacher wrote:
> Le 13/01/2015 03:16, Hui Wang a écrit :
>> Hi Sebastien,
>>
>> Is it possible to merge this fix to Trusty,
> Hey Hui,
>
> Yes, I was waiting to get some feedback from the upload to vivid, I'm
> going to SRU it next
>
> Cheers,
> Sebastien Bacher
>

[Sebastien Bacher (seb128)]

Hey Hui,

We could probably SRU it now, there are some issues though like [1] the
fact that indicator menus are misplaced on the greeter when hidpi
scaling on. We could have a first SRU to try to activate it only for the
installer/oem config (we just need to find e.g an env variable specific
to those sessions) or wait to have a fix for the unity-greeter issue and
SRU that as well.
Do you have a preference for one of those options?

Cheers,
Sebastien Bacher

[1] https://bugs.launchpad.net/ubuntu/+source/unity-greeter/+bug/1434094

Le 25/03/2015 07:37, Hui Wang a écrit :
> Hello Sebastien,
>
> Our OEM project has been waiting this fix to be merged to Trusty
> (14.04) , is it possible we do that now? If you need me to do
> something, just let me know.
>
>
> Thanks,
> Hui.

[Hui Wang (hui.wang)]

Hello Seb,

The option 2 is fine, it is best that two fixes to be SRUed together. :-)

Thanks,
Hui.

On 03/25/2015 04:07 PM, Sebastien Bacher wrote:
> Hey Hui,
>
> We could probably SRU it now, there are some issues though like [1] the
> fact that indicator menus are misplaced on the greeter when hidpi
> scaling on. We could have a first SRU to try to activate it only for the
> installer/oem config (we just need to find e.g an env variable specific
> to those sessions) or wait to have a fix for the unity-greeter issue and
> SRU that as well.
> Do you have a preference for one of those options?
>
> Cheers,
> Sebastien Bacher
>
> [1] https://bugs.launchpad.net/ubuntu/+source/unity-greeter/+bug/1434094
>
> Le 25/03/2015 07:37, Hui Wang a écrit :
>> Hello Sebastien,
>>
>> Our OEM project has been waiting this fix to be merged to Trusty
>> (14.04) , is it possible we do that now? If you need me to do
>> something, just let me know.
>>
>>
>> Thanks,
>> Hui.
>
>

=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c	2014-03-04 10:49:56 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c	2014-12-03 02:43:22 +0000
@@ -257,6 +257,22 @@
         NULL
 };
 
+static const char *audio_volume_icons[] = {
+        "audio-volume-muted-symbolic",
+        "audio-volume-low-symbolic",
+        "audio-volume-medium-symbolic",
+        "audio-volume-high-symbolic",
+        NULL
+};
+
+static const char *mic_volume_icons[] = {
+        "microphone-sensitivity-muted-symbolic",
+        "microphone-sensitivity-low-symbolic",
+        "microphone-sensitivity-medium-symbolic",
+        "microphone-sensitivity-high-symbolic",
+        NULL
+};
+
 static const char *brightness_icons[] = {
         "notification-display-brightness-off",
 	"notification-display-brightness-low",
@@ -343,10 +359,13 @@
 static gboolean
 ubuntu_osd_notification_show_volume (GsdMediaKeysManager *manager,
                                      gint value,
-                                     gboolean muted)
+                                     gboolean muted,
+                                     gboolean is_mic)
 {
+        const char **icons_name = is_mic ? mic_volume_icons : volume_icons;
+
         return ubuntu_osd_do_notification (&manager->priv->volume_notification,
-                                           "volume", value, muted, volume_icons);
+                                           "volume", value, muted, icons_name);
 }
 
 static gboolean
@@ -606,20 +625,6 @@
                           gboolean muted,
                           int volume)
 {
-        static const char *icon_names[] = {
-                "audio-volume-muted-symbolic",
-                "audio-volume-low-symbolic",
-                "audio-volume-medium-symbolic",
-                "audio-volume-high-symbolic",
-                NULL
-        };
-        static const char *mic_icon_names[] = {
-                "microphone-sensitivity-muted-symbolic",
-                "microphone-sensitivity-low-symbolic",
-                "microphone-sensitivity-medium-symbolic",
-                "microphone-sensitivity-high-symbolic",
-                NULL
-        };
         int n;
 
         if (muted) {
@@ -635,9 +640,9 @@
         }
 
 	if (is_mic)
-		return mic_icon_names[n];
+		return mic_volume_icons[n];
 	else
-		return icon_names[n];
+		return audio_volume_icons[n];
 }
 
 static gboolean
@@ -1337,7 +1342,7 @@
         const GvcMixerStreamPort *port;
         const char *icon;
 
-        if (ubuntu_osd_notification_show_volume (manager, vol, muted))
+        if (ubuntu_osd_notification_show_volume (manager, vol, muted, !GVC_IS_MIXER_SINK (stream)))
                 goto done;
 
         vol = CLAMP (vol, 0, 100);