diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-05-28 21:53:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-28 21:53:41 +0000 |
| commit | 1142d8eceae962d481d922358ebe9837ba975a2a (patch) | |
| tree | c9bdb8ccd99d406c1dc466afd642bd29fda04ff6 /include/system | |
| parent | f661a8f53158bc28faf754adf896c0a5a9dc999e (diff) | |
| parent | c8183af4b3a3515f8f0cff27b2808a7139f18230 (diff) | |
| download | system_core-1142d8eceae962d481d922358ebe9837ba975a2a.zip system_core-1142d8eceae962d481d922358ebe9837ba975a2a.tar.gz system_core-1142d8eceae962d481d922358ebe9837ba975a2a.tar.bz2 | |
Merge "audio: Add AUDIO_DEVICE_IN_BLUETOOTH_A2DP"
Diffstat (limited to 'include/system')
| -rw-r--r-- | include/system/audio.h | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index 1dabc22..c34a2a5 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -62,7 +62,7 @@ typedef enum { /* Do not change these values without updating their counterparts * in frameworks/base/media/java/android/media/MediaRecorder.java, - * frameworks/av/services/audioflinger/AudioPolicyService.cpp, + * frameworks/av/services/audiopolicy/AudioPolicyService.cpp, * and system/media/audio_effects/include/audio_effects/audio_effects_conf.h! */ typedef enum { @@ -437,6 +437,7 @@ enum { AUDIO_DEVICE_IN_LINE = AUDIO_DEVICE_BIT_IN | 0x8000, /* S/PDIF in */ AUDIO_DEVICE_IN_SPDIF = AUDIO_DEVICE_BIT_IN | 0x10000, + AUDIO_DEVICE_IN_BLUETOOTH_A2DP = AUDIO_DEVICE_BIT_IN | 0x20000, AUDIO_DEVICE_IN_DEFAULT = AUDIO_DEVICE_BIT_IN | AUDIO_DEVICE_BIT_DEFAULT, AUDIO_DEVICE_IN_ALL = (AUDIO_DEVICE_IN_COMMUNICATION | @@ -456,6 +457,7 @@ enum { AUDIO_DEVICE_IN_TV_TUNER | AUDIO_DEVICE_IN_LINE | AUDIO_DEVICE_IN_SPDIF | + AUDIO_DEVICE_IN_BLUETOOTH_A2DP | AUDIO_DEVICE_IN_DEFAULT), AUDIO_DEVICE_IN_ALL_SCO = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, AUDIO_DEVICE_IN_ALL_USB = (AUDIO_DEVICE_IN_USB_ACCESSORY | @@ -780,8 +782,17 @@ static inline bool audio_is_output_devices(audio_devices_t device) return (device & AUDIO_DEVICE_BIT_IN) == 0; } +static inline bool audio_is_a2dp_in_device(audio_devices_t device) +{ + if ((device & AUDIO_DEVICE_BIT_IN) != 0) { + device &= ~AUDIO_DEVICE_BIT_IN; + if ((popcount(device) == 1) && (device & AUDIO_DEVICE_IN_BLUETOOTH_A2DP)) + return true; + } + return false; +} -static inline bool audio_is_a2dp_device(audio_devices_t device) +static inline bool audio_is_a2dp_out_device(audio_devices_t device) { if ((popcount(device) == 1) && (device & AUDIO_DEVICE_OUT_ALL_A2DP)) return true; @@ -789,6 +800,12 @@ static inline bool audio_is_a2dp_device(audio_devices_t device) return false; } +// Deprecated - use audio_is_a2dp_out_device() instead +static inline bool audio_is_a2dp_device(audio_devices_t device) +{ + return audio_is_a2dp_out_device(device); +} + static inline bool audio_is_bluetooth_sco_device(audio_devices_t device) { if ((device & AUDIO_DEVICE_BIT_IN) == 0) { |