diff options
| author | Giulio Cervera <giulio.cervera@cyanogenmod.org> | 2013-02-14 12:22:52 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-02-16 03:50:59 -0800 |
| commit | 0b80bd63c6b1b6970226913849c61836daa16af0 (patch) | |
| tree | 5dbef4aeccd29f2d854318e2e848973c929126ae /audio/AudioPolicyManagerBase.cpp | |
| parent | 6c8bc31ebe68911a97c450e123e08f3881cd80ce (diff) | |
| download | hardware_libhardware_legacy-0b80bd63c6b1b6970226913849c61836daa16af0.zip hardware_libhardware_legacy-0b80bd63c6b1b6970226913849c61836daa16af0.tar.gz hardware_libhardware_legacy-0b80bd63c6b1b6970226913849c61836daa16af0.tar.bz2 | |
fmradio: cleanup QCOM_FM_ENABLED/STE_FM defs and ifdef
Change-Id: Ia34dca04e6b9de3509987ad9d88a5fecc3820e2f
Diffstat (limited to 'audio/AudioPolicyManagerBase.cpp')
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 722bbd3..4ea127e 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -2563,6 +2563,9 @@ AudioPolicyManagerBase::device_category AudioPolicyManagerBase::getDeviceCategor case AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET: case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP: case AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES: +#if defined(QCOM_FM_ENABLED) || defined(STE_FM) + case AUDIO_DEVICE_OUT_FM: +#endif return DEVICE_CATEGORY_HEADSET; case AUDIO_DEVICE_OUT_SPEAKER: case AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT: @@ -3405,7 +3408,7 @@ const struct StringToEnum sDeviceNameToEnumTable[] = { STRING_TO_ENUM(AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET), STRING_TO_ENUM(AUDIO_DEVICE_OUT_USB_DEVICE), STRING_TO_ENUM(AUDIO_DEVICE_OUT_USB_ACCESSORY), -#ifdef QCOM_HARDWARE +#if defined(QCOM_FM_ENABLED) || defined(STE_FM) STRING_TO_ENUM(AUDIO_DEVICE_OUT_FM), STRING_TO_ENUM(AUDIO_DEVICE_OUT_FM_TX), #endif @@ -3421,7 +3424,7 @@ const struct StringToEnum sDeviceNameToEnumTable[] = { STRING_TO_ENUM(AUDIO_DEVICE_IN_ANC_HEADSET), #endif STRING_TO_ENUM(AUDIO_DEVICE_IN_AUX_DIGITAL), -#ifdef QCOM_HARDWARE +#if defined(QCOM_FM_ENABLED) || defined(STE_FM) STRING_TO_ENUM(AUDIO_DEVICE_IN_FM_RX), STRING_TO_ENUM(AUDIO_DEVICE_IN_FM_RX_A2DP), #endif |