summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2013-03-28 18:11:44 +0000
committercodeworkx <codeworkx@cyanogenmod.org>2013-03-28 18:56:27 +0000
commit09d3f13837b9e0d6580b121daac1eac1fda01990 (patch)
tree38391bc0650c0f64e0822559d97c7b9bd6b97640 /audio
parentc775350911364b52ff76d3e41f78afbc8632ba74 (diff)
downloaddevice_samsung_i9300-09d3f13837b9e0d6580b121daac1eac1fda01990.zip
device_samsung_i9300-09d3f13837b9e0d6580b121daac1eac1fda01990.tar.gz
device_samsung_i9300-09d3f13837b9e0d6580b121daac1eac1fda01990.tar.bz2
i9300: fix dock audio
Change-Id: I44b8c3ec52652ff9f57a70aacd4c5156818e0037
Diffstat (limited to 'audio')
-rwxr-xr-xaudio/audio_hw.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 8473841..6645647 100755
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -438,8 +438,9 @@ static void set_incall_device(struct m0_audio_device *adev)
device_type = SOUND_AUDIO_PATH_HANDSET;
break;
case AUDIO_DEVICE_OUT_SPEAKER:
- case AUDIO_DEVICE_OUT_AUX_DIGITAL:
+ case AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET:
case AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET:
+ case AUDIO_DEVICE_OUT_AUX_DIGITAL:
device_type = SOUND_AUDIO_PATH_SPEAKER;
break;
case AUDIO_DEVICE_OUT_WIRED_HEADSET:
@@ -577,6 +578,12 @@ static void select_output_device(struct m0_audio_device *adev)
case AUDIO_DEVICE_OUT_ALL_SCO:
ALOGD("%s: AUDIO_DEVICE_OUT_ALL_SCO", __func__);
break;
+ case AUDIO_DEVICE_OUT_USB_ACCESSORY:
+ ALOGD("%s: AUDIO_DEVICE_OUT_USB_ACCESSORY", __func__);
+ break;
+ case AUDIO_DEVICE_OUT_USB_DEVICE:
+ ALOGD("%s: AUDIO_DEVICE_OUT_USB_DEVICE", __func__);
+ break;
default:
ALOGD("%s: AUDIO_DEVICE_OUT_ALL", __func__);
break;
@@ -2744,7 +2751,7 @@ static const struct {
{ AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE, "headphone" },
{ AUDIO_DEVICE_OUT_EARPIECE, "earpiece" },
{ AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET, "analog-dock" },
- { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, "digital-dock" },
+ { AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET, "analog-dock" },
{ AUDIO_DEVICE_OUT_ALL_SCO, "sco-out" },
{ AUDIO_DEVICE_IN_BUILTIN_MIC, "builtin-mic" },