Skip to content

Commit

Permalink
libaudio: Dock audio support
Browse files Browse the repository at this point in the history
Currently this routes media to the dock, but keeps call I/O on the
device speaker.

Works with Steven Harper's Samsung dock audio patches from 2-3
months ago.

Change-Id: I41764f51f8c2df4d2f745ebdb8ada1abf0c29848
  • Loading branch information
Entropy512 authored and pawitp committed Feb 25, 2013
1 parent 15d28f2 commit d545829
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions libaudio/AudioHardware.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,7 @@ void AudioHardware::setVoiceVolume_l(float volume)
break;

case AudioSystem::DEVICE_OUT_SPEAKER:
case AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET:
ALOGD("### speaker call volume");
type = SOUND_TYPE_SPEAKER;
break;
Expand Down Expand Up @@ -863,6 +864,7 @@ status_t AudioHardware::setIncallPath_l(uint32_t device)
break;

case AudioSystem::DEVICE_OUT_SPEAKER:
case AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET:
ALOGD("### incall mode speaker route");
path = SOUND_AUDIO_PATH_SPEAKER;
break;
Expand Down Expand Up @@ -1135,6 +1137,9 @@ const char *AudioHardware::getOutputRouteFromDevice(uint32_t device)
switch (device) {
case AudioSystem::DEVICE_OUT_EARPIECE:
return "RCV";
case AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET:
if (mMode == AudioSystem::MODE_RINGTONE) return "RING_SPK";
else return "EXTRA_DOCK_SPEAKER";
case AudioSystem::DEVICE_OUT_SPEAKER:
if (mMode == AudioSystem::MODE_RINGTONE) return "RING_SPK";
else return "SPK";
Expand All @@ -1146,6 +1151,7 @@ const char *AudioHardware::getOutputRouteFromDevice(uint32_t device)
else return "HP";
case (AudioSystem::DEVICE_OUT_SPEAKER|AudioSystem::DEVICE_OUT_WIRED_HEADPHONE):
case (AudioSystem::DEVICE_OUT_SPEAKER|AudioSystem::DEVICE_OUT_WIRED_HEADSET):
case (AudioSystem::DEVICE_OUT_SPEAKER|AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET):
if (mMode == AudioSystem::MODE_RINGTONE) return "RING_SPK_HP";
else return "SPK_HP";
case AudioSystem::DEVICE_OUT_BLUETOOTH_SCO:
Expand All @@ -1163,6 +1169,7 @@ const char *AudioHardware::getVoiceRouteFromDevice(uint32_t device)
case AudioSystem::DEVICE_OUT_EARPIECE:
return "RCV";
case AudioSystem::DEVICE_OUT_SPEAKER:
case AudioSystem::DEVICE_OUT_ANLG_DOCK_HEADSET:
return "SPK";
case AudioSystem::DEVICE_OUT_WIRED_HEADPHONE:
case AudioSystem::DEVICE_OUT_WIRED_HEADSET:
Expand Down

0 comments on commit d545829

Please sign in to comment.