Merge lp:~tiagosh/telepathy-ofono/fallback_a2dp into lp:telepathy-ofono

[Tiago Salem Herrmann]

Fallback to a2dp if no profile is set.

Fallback to a2dp if no profile is set.

Unmerged revisions

172. By Tiago Salem Herrmann on 2015-11-27

Fallback to a2dp if no profile is set

171. By Tiago Salem Herrmann on 2015-11-24

Set bluetooth device when playing the ringtone

=== modified file 'connection.cpp'
--- connection.cpp	2015-10-13 19:29:54 +0000
+++ connection.cpp	2015-11-27 15:56:01 +0000
@@ -72,7 +72,7 @@
 static void enable_ringtone()
 {
 #ifdef USE_PULSEAUDIO
-    QPulseAudioEngine::instance()->setCallMode(CallRinging, AudioModeWiredOrSpeaker);
+    QPulseAudioEngine::instance()->setCallMode(CallRinging, AudioModeBtOrWiredOrSpeaker);
 #endif
 }
 

=== modified file 'qpulseaudioengine.cpp'
--- qpulseaudioengine.cpp	2015-11-10 07:49:07 +0000
+++ qpulseaudioengine.cpp	2015-11-27 15:56:01 +0000
@@ -113,6 +113,7 @@
     , m_voicecallprofile("")
     , m_bt_hsp("")
     , m_bt_hsp_a2dp("")
+    , m_default_bt_card_fallback("")
 
 {
     m_mainLoop = pa_threaded_mainloop_new();
@@ -658,14 +659,26 @@
 {
     qDebug("Notified about card (%s) add event from PulseAudio", info->name);
 
+    /* Check if it's indeed a BT device (with at least one hsp profile) */
+    pa_card_profile_info2 *hsp = NULL, *a2dp = NULL;
+    for (int i = 0; i < info->n_profiles; i++) {
+        if (!strcmp(info->profiles2[i]->name, PULSEAUDIO_PROFILE_HSP))
+            hsp = info->profiles2[i];
+        else if (!strcmp(info->profiles2[i]->name, PULSEAUDIO_PROFILE_A2DP) && 
+                  info->profiles2[i]->available != 0) {
+            qDebug("Found a2dp");
+            a2dp = info->profiles2[i];
+        }
+        qDebug("%s", info->profiles2[i]->name);
+    }
+
+    if ((!info->active_profile || !strcmp(info->active_profile->name, "off")) && a2dp) {
+        qDebug("No profile set");
+        m_default_bt_card_fallback = info->name;
+    }
+
     /* We only care about BT (HSP) devices, and if one is not already available */
     if ((m_callstatus != CallEnded) && ((m_bt_hsp == "") || (m_bt_hsp_a2dp == ""))) {
-        /* Check if it's indeed a BT device (with at least one hsp profile) */
-        pa_card_profile_info *hsp = NULL;
-        for (int i = 0; i < info->n_profiles; i++) {
-            if (!strcmp(info->profiles[i].name, PULSEAUDIO_PROFILE_HSP))
-                hsp = &info->profiles[i];
-        }
         if (hsp)
             m_handleevent = true;
     }
@@ -675,6 +688,25 @@
 {
     qDebug("Notified about card (%s) changes event from PulseAudio", info->name);
 
+    /* Check if it's indeed a BT device (with at least one hsp profile) */
+    pa_card_profile_info2 *hsp = NULL, *a2dp = NULL;
+    for (int i = 0; i < info->n_profiles; i++) {
+        if (!strcmp(info->profiles2[i]->name, PULSEAUDIO_PROFILE_HSP))
+            hsp = info->profiles2[i];
+        else if (!strcmp(info->profiles2[i]->name, PULSEAUDIO_PROFILE_A2DP) && 
+                  info->profiles2[i]->available != 0) {
+            qDebug("Found a2dp");
+            a2dp = info->profiles2[i];
+        }
+        qDebug("%s", info->profiles2[i]->name);
+    }
+
+    if ((!info->active_profile || !strcmp(info->active_profile->name, "off")) && a2dp) {
+        qDebug("No profile set");
+        m_default_bt_card_fallback = info->name;
+    }
+
+
     /* We only care if the card event for the voicecall capable card */
     if ((m_callstatus == CallActive) && (!strcmp(info->name, m_voicecallcard.c_str()))) {
         if (m_audiomode == AudioModeWiredHeadset) {
@@ -718,6 +750,15 @@
         o = pa_context_get_card_info_by_index(m_context, idx, plug_card_cb, this);
         if (!handleOperation(o, "pa_context_get_card_info_by_index"))
             return;
+
+        if (m_default_bt_card_fallback != "") {
+            o = pa_context_set_card_profile_by_name(m_context,
+                m_default_bt_card_fallback.c_str(), PULSEAUDIO_PROFILE_A2DP, success_cb, this);
+            if (!handleOperation(o, "pa_context_set_card_profile_by_name"))
+                return;
+            m_default_bt_card_fallback = "";
+        }
+
         if (m_handleevent) {
             qDebug("Adding new BT-HSP capable device");
             /* In case A2DP is available, switch to HSP */
@@ -730,6 +771,15 @@
         o = pa_context_get_card_info_by_index(m_context, idx, update_card_cb, this);
         if (!handleOperation(o, "pa_context_get_card_info_by_index"))
             return;
+
+        if (m_default_bt_card_fallback != "") {
+            o = pa_context_set_card_profile_by_name(m_context,
+                m_default_bt_card_fallback.c_str(), PULSEAUDIO_PROFILE_A2DP, success_cb, this);
+            if (!handleOperation(o, "pa_context_set_card_profile_by_name"))
+                return;
+            m_default_bt_card_fallback = "";
+        }
+
         if (m_handleevent) {
             /* In this case it means the handset state changed */
             qDebug("Notifying card changes for the voicecall capable card");

=== modified file 'qpulseaudioengine.h'
--- qpulseaudioengine.h	2015-07-28 18:10:10 +0000
+++ qpulseaudioengine.h	2015-11-27 15:56:01 +0000
@@ -32,7 +32,8 @@
     AudioModeBluetooth = 0x0008,
     AudioModeBtOrWiredOrEarpiece = AudioModeBluetooth | AudioModeWiredHeadset | AudioModeEarpiece,
     AudioModeWiredOrEarpiece = AudioModeWiredHeadset | AudioModeEarpiece,
-    AudioModeWiredOrSpeaker = AudioModeWiredHeadset | AudioModeSpeaker
+    AudioModeWiredOrSpeaker = AudioModeWiredHeadset | AudioModeSpeaker,
+    AudioModeBtOrWiredOrSpeaker = AudioModeBluetooth | AudioModeWiredOrSpeaker
 };
 
 Q_DECLARE_METATYPE(AudioMode)
@@ -94,6 +95,7 @@
     std::string m_nametoset, m_valuetoset;
     std::string m_defaultsink, m_defaultsource;
     std::string m_bt_hsp, m_bt_hsp_a2dp;
+    std::string m_default_bt_card_fallback;
     std::string m_voicecallcard, m_voicecallhighest, m_voicecallprofile;
 
     bool handleOperation(pa_operation *operation, const char *func_name);