summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli B <abittin@gmail.com>2014-09-15 22:34:44 +0200
committerAli B <abittin@gmail.com>2014-09-15 22:34:44 +0200
commit6ab8406ea0a115398d87fa776a97e6b919ddea11 (patch)
tree07423d1b8508342b7400dd69c0036a7d63401363
parent6d35f2956639f78f0171a355178b84a3fb5f5c6b (diff)
Revert "Fix build for non-AV-ENHANCED or non-QCOM boards"
This reverts commit 6d35f2956639f78f0171a355178b84a3fb5f5c6b. Change-Id: I1fc71b527f8eed643c92994e23f38b15d4253065
-rw-r--r--audio/AudioPolicyManagerBase.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp
index 99ab2e8..cb90e74 100644
--- a/audio/AudioPolicyManagerBase.cpp
+++ b/audio/AudioPolicyManagerBase.cpp
@@ -1491,8 +1491,6 @@ bool AudioPolicyManagerBase::isOffloadSupported(const audio_offload_info_t& offl
char propValue[PROPERTY_VALUE_MAX];
bool pcmOffload = false;
-
-#if defined(ENABLE_AV_ENHANCEMENTS) || defined(ENABLE_OFFLOAD_ENHANCEMENTS)
if (audio_is_offload_pcm(offloadInfo.format)) {
if(property_get("audio.offload.pcm.enable", propValue, "false")) {
bool prop_enabled = atoi(propValue) || !strncmp("true", propValue, 4);
@@ -1506,7 +1504,6 @@ bool AudioPolicyManagerBase::isOffloadSupported(const audio_offload_info_t& offl
return false;
}
}
-#endif
// Check if offload has been disabled
if (property_get("audio.offload.disable", propValue, "0")) {
@@ -3824,10 +3821,8 @@ const struct StringToEnum sFormatNameToEnumTable[] = {
STRING_TO_ENUM(AUDIO_FORMAT_EVRCNW),
STRING_TO_ENUM(AUDIO_FORMAT_FLAC),
#endif
-#if defined(ENABLE_AV_ENHANCEMENTS) || defined(ENABLE_OFFLOAD_ENHANCEMENTS)
STRING_TO_ENUM(AUDIO_FORMAT_PCM_16_BIT_OFFLOAD),
STRING_TO_ENUM(AUDIO_FORMAT_PCM_24_BIT_OFFLOAD),
-#endif
};
const struct StringToEnum sOutChannelsNameToEnumTable[] = {