commit 56caa269d2fff5977724c486f7059d1cc11e0be7
author Christopher N. Hesse <raymanfx@gmail.com> Mon Mar 20 19:40:53 2017 +0100
committer Christopher N. Hesse <raymanfx@gmail.com> Mon Mar 20 19:48:35 2017 +0100
tree d6931475c23c3fb4ce8e9d71ce985b92739e18b9
parent 51bd12c20d5b0d4667299e87ba2e9a3317e81828

audio: Split BT SCO media/incall paths

Change-Id: I23a621855e8b96edcd92d8740dfec270ff7e7407

audio/audio_hw.c

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 2f8ce97..9a94e61 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -309,10 +309,11 @@
     [SND_DEVICE_OUT_VOICE_SPEAKER_WB] = "voice-speaker-wb",
     [SND_DEVICE_OUT_VOICE_HEADPHONES] = "voice-headphones",
     [SND_DEVICE_OUT_VOICE_HEADPHONES_WB] = "voice-headphones-wb",
+    [SND_DEVICE_OUT_VOICE_BT_SCO] = "voice-bt-sco-headset",
+    [SND_DEVICE_OUT_VOICE_BT_SCO_WB] = "voice-bt-sco-headset-wb",
     [SND_DEVICE_OUT_HDMI] = "hdmi",
     [SND_DEVICE_OUT_SPEAKER_AND_HDMI] = "speaker-and-hdmi",
     [SND_DEVICE_OUT_BT_SCO] = "bt-sco-headset",
-    [SND_DEVICE_OUT_BT_SCO_WB] = "bt-sco-headset-wb",
 
     /* Capture sound devices */
     [SND_DEVICE_IN_EARPIECE_MIC] = "earpiece-mic",
@@ -328,9 +329,10 @@
     [SND_DEVICE_IN_VOICE_SPEAKER_MIC_WB] = "voice-speaker-mic-wb",
     [SND_DEVICE_IN_VOICE_HEADSET_MIC] = "voice-headset-mic",
     [SND_DEVICE_IN_VOICE_HEADSET_MIC_WB] = "voice-headset-mic-wb",
+    [SND_DEVICE_IN_VOICE_BT_SCO_MIC] = "voice-bt-sco-mic",
+    [SND_DEVICE_IN_VOICE_BT_SCO_MIC_WB] = "voice-bt-sco-mic-wb",
     [SND_DEVICE_IN_HDMI_MIC] = "hdmi-mic",
     [SND_DEVICE_IN_BT_SCO_MIC] = "bt-sco-mic",
-    [SND_DEVICE_IN_BT_SCO_MIC_WB] = "bt-sco-mic-wb",
     [SND_DEVICE_IN_CAMCORDER_MIC] = "camcorder-mic",
     [SND_DEVICE_IN_VOICE_REC_HEADSET_MIC] = "voice-rec-headset-mic",
     [SND_DEVICE_IN_VOICE_REC_MIC] = "voice-rec-mic",
@@ -534,7 +536,7 @@
             devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) {
             snd_device = SND_DEVICE_OUT_VOICE_HEADPHONES;
         } else if (devices & AUDIO_DEVICE_OUT_ALL_SCO) {
-            snd_device = SND_DEVICE_OUT_BT_SCO;
+            snd_device = SND_DEVICE_OUT_VOICE_BT_SCO;
         } else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {
             snd_device = SND_DEVICE_OUT_VOICE_SPEAKER;
         } else if (devices & AUDIO_DEVICE_OUT_EARPIECE) {
@@ -546,7 +548,7 @@
                 devices & AUDIO_DEVICE_OUT_WIRED_HEADSET) {
                 snd_device = SND_DEVICE_OUT_VOICE_HEADPHONES_WB;
             } else if (devices & AUDIO_DEVICE_OUT_ALL_SCO) {
-                snd_device = SND_DEVICE_OUT_BT_SCO_WB;
+                snd_device = SND_DEVICE_OUT_VOICE_BT_SCO_WB;
             } else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {
                 snd_device = SND_DEVICE_OUT_VOICE_SPEAKER_WB;
             } else if (devices & AUDIO_DEVICE_OUT_EARPIECE) {
@@ -663,9 +665,9 @@
 
             if (out_device & AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET) {
                 if (voice_session_uses_wideband(adev->voice.session)) {
-                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB;
+                    snd_device = SND_DEVICE_IN_VOICE_BT_SCO_MIC_WB;
                 } else {
-                    snd_device = SND_DEVICE_IN_BT_SCO_MIC;
+                    snd_device = SND_DEVICE_IN_VOICE_BT_SCO_MIC;
                 }
             } else if (voice_session_uses_twomic(adev->voice.session)) {
                 snd_device = SND_DEVICE_IN_VOICE_EARPIECE_MIC;