diff options
| author | Eric Laurent <elaurent@google.com> | 2015-07-06 21:47:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-06 21:47:23 +0000 |
| commit | 7d27e250568b994bf62f9c5bbdb82b24ea676b7f (patch) | |
| tree | 64b34f62e0302d7a2abd3da51927a68fd9214ca2 | |
| parent | d29ff8c26084307d98aeab70d720a7b42de80d12 (diff) | |
| parent | 4d5418183c209ecd5c4109f0ecb6c6f259360c0e (diff) | |
| download | android_system_media-7d27e250568b994bf62f9c5bbdb82b24ea676b7f.tar.gz android_system_media-7d27e250568b994bf62f9c5bbdb82b24ea676b7f.tar.bz2 android_system_media-7d27e250568b994bf62f9c5bbdb82b24ea676b7f.zip | |
Merge "audio: add definitions for devices connected over IP" into mnc-dev
| -rw-r--r-- | audio/include/system/audio.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/audio/include/system/audio.h b/audio/include/system/audio.h index 0865d7b3..8e71b9bc 100644 --- a/audio/include/system/audio.h +++ b/audio/include/system/audio.h @@ -615,6 +615,7 @@ enum { AUDIO_DEVICE_OUT_AUX_LINE = 0x200000, /* limited-output speaker device for acoustic safety */ AUDIO_DEVICE_OUT_SPEAKER_SAFE = 0x400000, + AUDIO_DEVICE_OUT_IP = 0x800000, AUDIO_DEVICE_OUT_DEFAULT = AUDIO_DEVICE_BIT_DEFAULT, AUDIO_DEVICE_OUT_ALL = (AUDIO_DEVICE_OUT_EARPIECE | AUDIO_DEVICE_OUT_SPEAKER | @@ -639,6 +640,7 @@ enum { AUDIO_DEVICE_OUT_FM | AUDIO_DEVICE_OUT_AUX_LINE | AUDIO_DEVICE_OUT_SPEAKER_SAFE | + AUDIO_DEVICE_OUT_IP | AUDIO_DEVICE_OUT_DEFAULT), AUDIO_DEVICE_OUT_ALL_A2DP = (AUDIO_DEVICE_OUT_BLUETOOTH_A2DP | AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES | @@ -675,6 +677,7 @@ enum { AUDIO_DEVICE_IN_SPDIF = AUDIO_DEVICE_BIT_IN | 0x10000, AUDIO_DEVICE_IN_BLUETOOTH_A2DP = AUDIO_DEVICE_BIT_IN | 0x20000, AUDIO_DEVICE_IN_LOOPBACK = AUDIO_DEVICE_BIT_IN | 0x40000, + AUDIO_DEVICE_IN_IP = AUDIO_DEVICE_BIT_IN | 0x80000, AUDIO_DEVICE_IN_DEFAULT = AUDIO_DEVICE_BIT_IN | AUDIO_DEVICE_BIT_DEFAULT, AUDIO_DEVICE_IN_ALL = (AUDIO_DEVICE_IN_COMMUNICATION | @@ -696,6 +699,7 @@ enum { AUDIO_DEVICE_IN_SPDIF | AUDIO_DEVICE_IN_BLUETOOTH_A2DP | AUDIO_DEVICE_IN_LOOPBACK | + AUDIO_DEVICE_IN_IP | 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 | @@ -1418,13 +1422,15 @@ static inline bool audio_device_is_digital(audio_devices_t device) { // input return (device & (AUDIO_DEVICE_IN_ALL_USB | AUDIO_DEVICE_IN_HDMI | - AUDIO_DEVICE_IN_SPDIF)) != 0; + AUDIO_DEVICE_IN_SPDIF | + AUDIO_DEVICE_IN_IP)) != 0; } else { // output return (device & (AUDIO_DEVICE_OUT_ALL_USB | AUDIO_DEVICE_OUT_HDMI | AUDIO_DEVICE_OUT_HDMI_ARC | - AUDIO_DEVICE_OUT_SPDIF)) != 0; + AUDIO_DEVICE_OUT_SPDIF | + AUDIO_DEVICE_OUT_IP)) != 0; } } |