diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-12-23 01:17:07 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-12-23 01:19:54 +0000 |
| commit | 9b1ad4ad4b698c6ed929e75133d98b1fe19fc021 (patch) | |
| tree | 8ff8370111ab20eda53093b55a0ecd32a6a139b1 /include | |
| parent | 16753a4be3e1ebaecdcd215b27df21b023403d5e (diff) | |
| download | system_core-9b1ad4ad4b698c6ed929e75133d98b1fe19fc021.tar.gz system_core-9b1ad4ad4b698c6ed929e75133d98b1fe19fc021.tar.bz2 system_core-9b1ad4ad4b698c6ed929e75133d98b1fe19fc021.zip | |
audio: Fix input enums for pre-4.2 audio blobs
Change-Id: Iec9f8d915d069168664d2cd873574db7fe5cddc7
Diffstat (limited to 'include')
| -rw-r--r-- | include/system/audio.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index d246070a..92e9ae61 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -281,7 +281,11 @@ typedef enum { enum { AUDIO_DEVICE_NONE = 0x0, /* reserved bits */ +#if defined(ICS_AUDIO_BLOB) || defined(MR0_AUDIO_BLOB) + AUDIO_DEVICE_BIT_IN = 0x10000, +#else AUDIO_DEVICE_BIT_IN = 0x80000000, +#endif AUDIO_DEVICE_BIT_DEFAULT = 0x40000000, /* output devices */ AUDIO_DEVICE_OUT_EARPIECE = 0x1, @@ -328,6 +332,22 @@ enum { AUDIO_DEVICE_OUT_USB_DEVICE), /* input devices */ +#if defined(ICS_AUDIO_BLOB) || defined(MR0_AUDIO_BLOB) + AUDIO_DEVICE_IN_COMMUNICATION = AUDIO_DEVICE_BIT_IN * 0x1, + AUDIO_DEVICE_IN_AMBIENT = AUDIO_DEVICE_BIT_IN * 0x2, + AUDIO_DEVICE_IN_BUILTIN_MIC = AUDIO_DEVICE_BIT_IN * 0x4, + AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET = AUDIO_DEVICE_BIT_IN * 0x8, + AUDIO_DEVICE_IN_WIRED_HEADSET = AUDIO_DEVICE_BIT_IN * 0x10, + AUDIO_DEVICE_IN_AUX_DIGITAL = AUDIO_DEVICE_BIT_IN * 0x20, + AUDIO_DEVICE_IN_VOICE_CALL = AUDIO_DEVICE_BIT_IN * 0x40, + AUDIO_DEVICE_IN_BACK_MIC = AUDIO_DEVICE_BIT_IN * 0x80, + AUDIO_DEVICE_IN_REMOTE_SUBMIX = AUDIO_DEVICE_BIT_IN * 0x100, + AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET = AUDIO_DEVICE_BIT_IN * 0x200, + AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET = AUDIO_DEVICE_BIT_IN * 0x400, + AUDIO_DEVICE_IN_USB_ACCESSORY = AUDIO_DEVICE_BIT_IN * 0x800, + AUDIO_DEVICE_IN_USB_DEVICE = AUDIO_DEVICE_BIT_IN * 0x1000, + AUDIO_DEVICE_IN_DEFAULT = AUDIO_DEVICE_IN_BUILTIN_MIC, +#else AUDIO_DEVICE_IN_COMMUNICATION = AUDIO_DEVICE_BIT_IN | 0x1, AUDIO_DEVICE_IN_AMBIENT = AUDIO_DEVICE_BIT_IN | 0x2, AUDIO_DEVICE_IN_BUILTIN_MIC = AUDIO_DEVICE_BIT_IN | 0x4, @@ -342,6 +362,7 @@ enum { AUDIO_DEVICE_IN_USB_ACCESSORY = AUDIO_DEVICE_BIT_IN | 0x800, AUDIO_DEVICE_IN_USB_DEVICE = AUDIO_DEVICE_BIT_IN | 0x1000, AUDIO_DEVICE_IN_DEFAULT = AUDIO_DEVICE_BIT_IN | AUDIO_DEVICE_BIT_DEFAULT, +#endif AUDIO_DEVICE_IN_ALL = (AUDIO_DEVICE_IN_COMMUNICATION | AUDIO_DEVICE_IN_AMBIENT | |