Ticket #641: pa-bluetooth-channels.patch

src/modules/bluetooth/module-bluetooth-device.c

@@ -511 +511 @@
 
     pa_assert((unsigned) i < PA_ELEMENTSOF(freq_table));
 
+    if ((cap->channel_mode & BT_A2DP_CHANNEL_MODE_MONO) &&
+        (u->sample_spec.channels <= 1))
+        u->sample_spec.channels = 1;
+    else
+        u->sample_spec.channels = 2;
+    
     if (cap->capability.configured)
         return 0;
 
     if (u->sample_spec.channels <= 1) {
-        if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_MONO) {
+        if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_MONO)
             cap->channel_mode = BT_A2DP_CHANNEL_MODE_MONO;
-            u->sample_spec.channels = 1;
-        } else
-            u->sample_spec.channels = 2;
     }
 
     if (u->sample_spec.channels >= 2) {
-        u->sample_spec.channels = 2;
-
         if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_JOINT_STEREO)
             cap->channel_mode = BT_A2DP_CHANNEL_MODE_JOINT_STEREO;
         else if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_STEREO)
@@ -533 +534 @@
             cap->channel_mode = BT_A2DP_CHANNEL_MODE_DUAL_CHANNEL;
         else if (cap->channel_mode & BT_A2DP_CHANNEL_MODE_MONO) {
             cap->channel_mode = BT_A2DP_CHANNEL_MODE_MONO;
-            u->sample_spec.channels = 1;
         } else {
             pa_log("No supported channel modes");
             return -1;