Merge lp:~diwic/telepathy-ofono/monitor-pulseaudio-changes into lp:telepathy-ofono

[David Henningsson]

Ensure speakermode status is correct even after plug/unplug of headphones

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:46
http://jenkins.qa.ubuntu.com/job/telepathy-ofono-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telepathy-ofono-saucy-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins:8080/job/telepathy-ofono-ci/19/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good now. Thanks for the patch.

review: Approve

=== modified file 'qpulseaudioengine.cpp'
--- qpulseaudioengine.cpp	2013-08-22 07:22:28 +0000
+++ qpulseaudioengine.cpp	2013-10-04 06:14:25 +0000
@@ -47,12 +47,26 @@
 #endif
 }
 
+static void subscribeCallback(pa_context *context, pa_subscription_event_type_t t, uint32_t idx, void *userdata)
+{
+    /* We're interested in plug/unplug stuff only, i e, card changes */
+    if ((t & PA_SUBSCRIPTION_EVENT_FACILITY_MASK) != PA_SUBSCRIPTION_EVENT_CARD)
+        return;
+    if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) != PA_SUBSCRIPTION_EVENT_CHANGE)
+        return;
+
+    /* Handle it later, and in the right thread */
+    QMetaObject::invokeMethod((QPulseAudioEngine *) userdata, "plugUnplugSlot", Qt::QueuedConnection);
+}
+
 Q_GLOBAL_STATIC(QPulseAudioEngine, pulseEngine);
 
 QPulseAudioEngine::QPulseAudioEngine(QObject *parent)
     : QObject(parent)
     , m_mainLoopApi(0)
     , m_context(0)
+    , m_incall(false)
+    , m_speakermode(false)
 
 {
     bool keepGoing = true;
@@ -126,6 +140,8 @@
 
     if (ok) {
         pa_context_set_state_callback(m_context, contextStateCallback, this);
+        pa_context_set_subscribe_callback(m_context, subscribeCallback, this);
+        pa_context_subscribe(m_context, PA_SUBSCRIPTION_MASK_CARD, NULL, this);
     } else {
         if (m_context) {
             pa_context_unref(m_context);
@@ -159,8 +175,8 @@
 
 void QPulseAudioEngine::sinkInfoCallback(const pa_sink_info *info)
 {
-    pa_sink_port_info *earpiece = NULL, *speaker = NULL, *highest = NULL;
-    pa_sink_port_info *preferred = NULL;
+    pa_sink_port_info *earpiece = NULL, *speaker = NULL, *headphones = NULL;
+    pa_sink_port_info *highest = NULL, *preferred = NULL;
 
     for (int i = 0; i < info->n_ports; i++) {
         if (!highest || info->ports[i]->priority > highest->priority) {
@@ -171,6 +187,8 @@
             earpiece = info->ports[i];
         if (!strcmp(info->ports[i]->name, "[Out] Speaker"))
             speaker = info->ports[i];
+        if (!strcmp(info->ports[i]->name, "[Out] Headphones") && info->ports[i]->available != PA_PORT_AVAILABLE_NO)
+            headphones = info->ports[i];
     }
 
     if (!earpiece)
@@ -182,7 +200,7 @@
     if (m_speakermode)
         preferred = speaker;
     else if (m_incall)
-        preferred = earpiece;
+        preferred = headphones ? headphones : earpiece;
     if (!preferred)
         preferred = highest;
 
@@ -298,6 +316,13 @@
     pa_threaded_mainloop_unlock(m_mainLoop);    
 }
 
+void QPulseAudioEngine::plugUnplugSlot()
+{
+    qDebug("Notified about card event from PulseAudio");
+    if (m_incall)
+        setCallMode(m_incall, m_speakermode);
+}
+
 QT_END_NAMESPACE
 
 #endif

=== modified file 'qpulseaudioengine.h'
--- qpulseaudioengine.h	2013-08-22 07:22:28 +0000
+++ qpulseaudioengine.h	2013-10-04 06:14:25 +0000
@@ -41,9 +41,11 @@
 
     void setCallMode(bool inCall, bool speakerMode);
 
-    /* These two are only used internally */
+    /* These three are only used internally */
     void cardInfoCallback(const pa_card_info *card);
     void sinkInfoCallback(const pa_sink_info *sink);
+public Q_SLOTS:
+    void plugUnplugSlot();
 private:
     pa_mainloop_api *m_mainLoopApi;
     pa_threaded_mainloop *m_mainLoop;