diff options
| author | Giulio Cervera <giulio.cervera@gmail.com> | 2012-09-05 14:49:10 +0200 |
|---|---|---|
| committer | Giulio Cervera <giulio.cervera@gmail.com> | 2012-09-05 14:51:06 +0200 |
| commit | e5ca17d0f7e3c2cb7af922cf8e51df9b98219cd0 (patch) | |
| tree | bcc26634b31fedb39012feb72f8af7f3db617935 | |
| parent | fa042cbca21c99d4fb536b1253270533121ffa96 (diff) | |
| download | android_hardware_qcom_audio-e5ca17d0f7e3c2cb7af922cf8e51df9b98219cd0.tar.gz android_hardware_qcom_audio-e5ca17d0f7e3c2cb7af922cf8e51df9b98219cd0.tar.bz2 android_hardware_qcom_audio-e5ca17d0f7e3c2cb7af922cf8e51df9b98219cd0.zip | |
audio/msm8660: ifdef ANC
allow building without ANC
Change-Id: I8adef70849f6fc9667ebc936327262dee5236689
| -rw-r--r-- | msm8660/AudioPolicyManager.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/msm8660/AudioPolicyManager.cpp b/msm8660/AudioPolicyManager.cpp index c609a1ba..03a308b0 100644 --- a/msm8660/AudioPolicyManager.cpp +++ b/msm8660/AudioPolicyManager.cpp @@ -99,10 +99,12 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate if (device) break; device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADSET; if (device) break; +#ifdef QCOM_ANC_HEADSET_ENABLED device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANC_HEADPHONE; if (device) break; device = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANC_HEADSET; if (device) break; +#endif device = mAvailableOutputDevices & AUDIO_DEVICE_OUT_USB_ACCESSORY; if (device) break; device = mAvailableOutputDevices & AUDIO_DEVICE_OUT_USB_DEVICE; @@ -204,12 +206,14 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate if (device2 == 0) { device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADSET; } +#ifdef QCOM_ANC_HEADSET_ENABLED if (device2 == 0) { device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANC_HEADPHONE; } if (device2 == 0) { device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANC_HEADSET; } +#endif #ifdef QCOM_FM_ENABLED if (device2 == 0) { device2 = mAvailableOutputDevices & AudioSystem::DEVICE_OUT_FM_TX; @@ -250,12 +254,14 @@ audio_devices_t AudioPolicyManager::getDeviceForStrategy(routing_strategy strate device |= AudioSystem::DEVICE_OUT_FM; } #endif +#ifdef QCOM_ANC_HEADSET_ENABLED if (mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANC_HEADSET) { device |= AudioSystem::DEVICE_OUT_ANC_HEADSET; } if (mAvailableOutputDevices & AudioSystem::DEVICE_OUT_ANC_HEADPHONE) { device |= AudioSystem::DEVICE_OUT_ANC_HEADPHONE; } +#endif if (device == 0) { ALOGE("getDeviceForStrategy() no device found for STRATEGY_MEDIA"); } @@ -384,12 +390,14 @@ status_t AudioPolicyManager::setDeviceConnectionState(AudioSystem::audio_devices } } #endif +#ifdef QCOM_ANC_HEADSET_ENABLED if(device == AudioSystem::DEVICE_OUT_ANC_HEADPHONE || device == AudioSystem::DEVICE_OUT_ANC_HEADSET) { if(NewDevice == 0){ NewDevice = getDeviceForStrategy(STRATEGY_MEDIA, false); } } +#endif checkA2dpSuspend(); AudioPolicyManagerBase::checkOutputForAllStrategies(); @@ -416,8 +424,10 @@ status_t AudioPolicyManager::setDeviceConnectionState(AudioSystem::audio_devices device == AudioSystem::DEVICE_OUT_BLUETOOTH_SCO_HEADSET || device == AudioSystem::DEVICE_OUT_BLUETOOTH_SCO_CARKIT) { device = AudioSystem::DEVICE_IN_BLUETOOTH_SCO_HEADSET; +#ifdef QCOM_ANC_HEADSET_ENABLED } else if (device == AudioSystem::DEVICE_OUT_ANC_HEADSET) { device = AudioSystem::DEVICE_IN_ANC_HEADSET; //wait for actual ANC device +#endif }else { return NO_ERROR; } @@ -815,8 +825,10 @@ audio_devices_t AudioPolicyManager::getDeviceForInputSource(int inputSource) device = AudioSystem::DEVICE_IN_BLUETOOTH_SCO_HEADSET; } else if (mAvailableInputDevices & AudioSystem::DEVICE_IN_WIRED_HEADSET) { device = AudioSystem::DEVICE_IN_WIRED_HEADSET; +#ifdef QCOM_ANC_HEADSET_ENABLED } else if (mAvailableInputDevices & AudioSystem::DEVICE_IN_ANC_HEADSET) { device = AudioSystem::DEVICE_IN_ANC_HEADSET; +#endif } else if (mAvailableInputDevices & AudioSystem::DEVICE_IN_BUILTIN_MIC) { device = AudioSystem::DEVICE_IN_BUILTIN_MIC; } |