Merge lp:~diwic/unity-settings-daemon/lp1521664 into lp:unity-settings-daemon

[David Henningsson]

Update PulseAudio port names to fix LP: #1521664

Update PulseAudio port names to fix LP: #1521664

[Sebastien Bacher (seb128)]

seems fine to me but is the TODO something that could be done now?

review: Approve

[David Henningsson (diwic)]

I think so. I just have to think it through a bit more thoroughly, so it does not cause any regression if I just remove that part.

[Sebastien Bacher (seb128)]

k, do you want to wait on that to be resolved before merging or should we land that one and do a follow up later if needed? if we do the change earlier in the cycle is probably better than later, give more feedback cycles

[David Henningsson (diwic)]

I think we should merge this part of it without waiting for the TODO item to be fully resolved.

[Sebastien Bacher (seb128)]

wfm

review: Approve

=== modified file 'plugins/media-keys/gsd-media-keys-manager.c'
--- plugins/media-keys/gsd-media-keys-manager.c	2015-10-08 14:28:20 +0000
+++ plugins/media-keys/gsd-media-keys-manager.c	2015-12-03 09:34:29 +0000
@@ -2819,15 +2819,15 @@
                 break;
         case WDYPI_DIALOG_HEADPHONES:
                 pa_backend_set_port(pb, "analog-output-headphones", true);
-                pa_backend_set_port(pb, "analog-input-microphone-internal", false);
+                pa_backend_set_port(pb, "analog-input-internal-mic", false);
                 break;
         case WDYPI_DIALOG_HEADSET:
                 pa_backend_set_port(pb, "analog-output-headphones", true);
-                pa_backend_set_port(pb, "analog-input-microphone-headset", false);
+                pa_backend_set_port(pb, "analog-input-headset-mic", false);
                 break;
         case WDYPI_DIALOG_MICROPHONE:
                 pa_backend_set_port(pb, "analog-output-speaker", true);
-                pa_backend_set_port(pb, "analog-input-microphone", false);
+                pa_backend_set_port(pb, "analog-input-headphone-mic", false);
                 break;
         default:
                 break;

=== modified file 'plugins/media-keys/what-did-you-plug-in/pa-backend.c'
--- plugins/media-keys/what-did-you-plug-in/pa-backend.c	2014-02-15 08:33:21 +0000
+++ plugins/media-keys/what-did-you-plug-in/pa-backend.c	2015-12-03 09:34:29 +0000
@@ -42,10 +42,13 @@
     const pa_card_port_info *headphones, *headsetmic, *headphonemic;
 } headset_ports;
 
-/* In PulseAudio ports will show up with the following names:
+/* 
+   TODO: Check if we still need this with the changed PA port names
+
+   In PulseAudio ports will show up with the following names:
    Headphones - analog-output-headphones
-   Headset mic - analog-input-microphone-headset
-   Jack in mic-in mode - analog-input-microphone
+   Headset mic - analog-input-headset-mic (was: analog-input-microphone-headset)
+   Jack in mic-in mode - analog-input-headphone-mic (was: analog-input-microphone)
 
    However, since regular mics also show up as analog-input-microphone,
    we need to check for certain controls on alsa mixer level too, to know
@@ -71,9 +74,9 @@
         pa_card_port_info *p = c->ports[i];
         if (!strcmp(p->name, "analog-output-headphones"))
             h.headphones = p;
-        else if (!strcmp(p->name, "analog-input-microphone-headset"))
+        else if (!strcmp(p->name, "analog-input-headset-mic"))
             h.headsetmic = p;
-        else if (!strcmp(p->name, "analog-input-microphone"))
+        else if (!strcmp(p->name, "analog-input-headphone-mic"))
             h.headphonemic = p;
     }
     return h;