diff options
| author | Giulio Cervera <giulio.cervera@cyanogenmod.org> | 2013-02-16 03:50:05 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-02-16 03:50:05 -0800 |
| commit | 33bfa990d1502aae8503e7acec2d8a00e7ce02b0 (patch) | |
| tree | 4c60c201ebc5ce3e404cb014041c0ca324ac5332 | |
| parent | 29e9e0f427109a812c31d29e8bc6787a4b25819c (diff) | |
| parent | 7b3c541b486cfcdfed54d8555a03b319c4c27027 (diff) | |
| download | system_core-33bfa990d1502aae8503e7acec2d8a00e7ce02b0.tar.gz system_core-33bfa990d1502aae8503e7acec2d8a00e7ce02b0.tar.bz2 system_core-33bfa990d1502aae8503e7acec2d8a00e7ce02b0.zip | |
Merge "fmradio: cleanup QCOM_HARDWARE/STE_FM defs and ifdef" into cm-10.1
| -rw-r--r-- | include/system/audio.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/include/system/audio.h b/include/system/audio.h index 181b6ae4..a68f2e3d 100644 --- a/include/system/audio.h +++ b/include/system/audio.h @@ -68,7 +68,10 @@ typedef enum { /* An example of remote presentation is Wifi Display */ /* where a dongle attached to a TV can be used to */ /* play the mix captured by this audio source. */ - AUDIO_SOURCE_FM_RADIO_RX = 9, +#if defined(QCOM_FM_ENABLED) || defined(STE_FM) + AUDIO_SOURCE_FM_RX = 9, + AUDIO_SOURCE_FM_RX_A2DP = 10, +#endif AUDIO_SOURCE_CNT, AUDIO_SOURCE_MAX = AUDIO_SOURCE_CNT - 1, } audio_source_t; @@ -366,12 +369,11 @@ enum { AUDIO_DEVICE_OUT_ANC_HEADSET = 0x10000, AUDIO_DEVICE_OUT_ANC_HEADPHONE = 0x20000, AUDIO_DEVICE_OUT_PROXY = 0x40000, +#endif +#if defined(QCOM_FM_ENABLED) || defined(STE_FM) AUDIO_DEVICE_OUT_FM = 0x80000, AUDIO_DEVICE_OUT_FM_TX = 0x100000, #endif -#ifdef STE_FM - AUDIO_DEVICE_OUT_FM_TX = 0x10000, -#endif AUDIO_DEVICE_OUT_DEFAULT = AUDIO_DEVICE_BIT_DEFAULT, AUDIO_DEVICE_OUT_ALL = (AUDIO_DEVICE_OUT_EARPIECE | AUDIO_DEVICE_OUT_SPEAKER | @@ -393,10 +395,9 @@ enum { AUDIO_DEVICE_OUT_ANC_HEADSET | AUDIO_DEVICE_OUT_ANC_HEADPHONE | AUDIO_DEVICE_OUT_PROXY | - AUDIO_DEVICE_OUT_FM | - AUDIO_DEVICE_OUT_FM_TX | #endif -#ifdef STE_FM +#if defined(QCOM_FM_ENABLED) || defined(STE_FM) + AUDIO_DEVICE_OUT_FM | AUDIO_DEVICE_OUT_FM_TX | #endif AUDIO_DEVICE_OUT_DEFAULT), @@ -442,12 +443,11 @@ enum { #ifdef QCOM_HARDWARE AUDIO_DEVICE_IN_ANC_HEADSET = AUDIO_DEVICE_BIT_IN | 0x2000, AUDIO_DEVICE_IN_PROXY = AUDIO_DEVICE_BIT_IN | 0x4000, +#endif +#if defined(QCOM_FM_ENABLED) || defined(STE_FM) AUDIO_DEVICE_IN_FM_RX = AUDIO_DEVICE_BIT_IN | 0x8000, AUDIO_DEVICE_IN_FM_RX_A2DP = AUDIO_DEVICE_BIT_IN | 0x10000, #endif -#ifdef STE_FM - AUDIO_DEVICE_IN_FM_RX = AUDIO_DEVICE_BIT_IN | 0x2000, -#endif AUDIO_DEVICE_IN_DEFAULT = AUDIO_DEVICE_BIT_IN | AUDIO_DEVICE_BIT_DEFAULT, #endif @@ -466,12 +466,11 @@ enum { AUDIO_DEVICE_IN_USB_DEVICE | #ifdef QCOM_HARDWARE AUDIO_DEVICE_IN_ANC_HEADSET | - AUDIO_DEVICE_IN_FM_RX | - AUDIO_DEVICE_IN_FM_RX_A2DP | AUDIO_DEVICE_IN_PROXY | #endif -#ifdef STE_FM +#if defined(QCOM_FM_ENABLED) || defined(STE_FM) AUDIO_DEVICE_IN_FM_RX | + AUDIO_DEVICE_IN_FM_RX_A2DP | #endif AUDIO_DEVICE_IN_DEFAULT), AUDIO_DEVICE_IN_ALL_SCO = AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, |