diff options
| author | Bálint Czobor <czoborbalint@gmail.com> | 2014-01-10 16:21:38 +0100 |
|---|---|---|
| committer | Ethan Chen <intervigil@gmail.com> | 2015-07-27 14:52:28 -0700 |
| commit | 19616511570aa885d0e19a186c44f6456966ea42 (patch) | |
| tree | be894f0567ed8e3542165320cee2af4eca7b4989 | |
| parent | 74cc62888894818b2ed158eb61ec33cd7d2103e1 (diff) | |
| download | hardware_qcom_audio-19616511570aa885d0e19a186c44f6456966ea42.tar.gz hardware_qcom_audio-19616511570aa885d0e19a186c44f6456966ea42.tar.bz2 hardware_qcom_audio-19616511570aa885d0e19a186c44f6456966ea42.zip | |
audio-caf: Remove STE fmradio
Change-Id: Id57a0ad5f3175d4e146b77ee51abca36f2add3e5
| -rw-r--r-- | msm8660/AudioPolicyManager.cpp | 8 | ||||
| -rw-r--r-- | msm8660/audio_hw_hal.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/msm8660/AudioPolicyManager.cpp b/msm8660/AudioPolicyManager.cpp index 7a3b6111..6d882312 100644 --- a/msm8660/AudioPolicyManager.cpp +++ b/msm8660/AudioPolicyManager.cpp @@ -1624,7 +1624,7 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate } break; } -#if defined(QCOM_FM_ENABLED) || defined(STE_FM) +#ifdef QCOM_FM_ENABLED if (mAvailableOutputDevices & AUDIO_DEVICE_OUT_FM) { if (mForceUse[AudioSystem::FOR_MEDIA] == AudioSystem::FORCE_SPEAKER) { device &= ~(AUDIO_DEVICE_OUT_WIRED_HEADSET); @@ -1717,7 +1717,7 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate if (device2 == AUDIO_DEVICE_NONE) { device2 = mAvailableOutputDevices & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET; } -#if defined(QCOM_FM_ENABLED) || defined(STE_FM) +#ifdef QCOM_FM_ENABLED if (device2 == AUDIO_DEVICE_NONE) { device2 = mAvailableOutputDevices & AUDIO_DEVICE_OUT_FM_TX; } @@ -1877,7 +1877,7 @@ audio_devices_t AudioPolicyManager::getDeviceForInputSource(int inputSource) device = AUDIO_DEVICE_IN_REMOTE_SUBMIX; } break; -#if defined(QCOM_FM_ENABLED) || defined(STE_FM) +#ifdef QCOM_FM_ENABLED case AUDIO_SOURCE_FM_RX: device = AUDIO_DEVICE_IN_FM_RX; break; @@ -1939,7 +1939,7 @@ AudioPolicyManager::device_category AudioPolicyManager::getDeviceCategory(audio_ 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) +#ifdef QCOM_FM_ENABLED case AUDIO_DEVICE_OUT_FM: #endif return DEVICE_CATEGORY_HEADSET; diff --git a/msm8660/audio_hw_hal.cpp b/msm8660/audio_hw_hal.cpp index 8bd0ce97..6c7b1bfe 100644 --- a/msm8660/audio_hw_hal.cpp +++ b/msm8660/audio_hw_hal.cpp @@ -513,7 +513,7 @@ static uint32_t adev_get_supported_devices(const struct audio_hw_device *dev) AUDIO_DEVICE_OUT_ANC_HEADSET | AUDIO_DEVICE_OUT_ANC_HEADPHONE | #endif -#if defined(QCOM_FM_ENABLED) || defined(STE_FM) +#ifdef QCOM_FM_ENABLED AUDIO_DEVICE_OUT_FM | AUDIO_DEVICE_OUT_FM_TX | #endif @@ -535,7 +535,7 @@ static uint32_t adev_get_supported_devices(const struct audio_hw_device *dev) #ifdef QCOM_ANC_HEADSET_ENABLED AUDIO_DEVICE_IN_ANC_HEADSET | #endif -#if defined(QCOM_FM_ENABLED) || defined(STE_FM) +#ifdef QCOM_FM_ENABLED AUDIO_DEVICE_IN_FM_RX | AUDIO_DEVICE_IN_FM_RX_A2DP | #endif |