Remove API-related #defines from voice_engine_configurations.h

webrtc/voice_engine/voe_audio_processing_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/voice_engine/voe_audio_processing_impl.h"
 
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/voice_engine/channel.h"
 #include "webrtc/voice_engine/include/voe_errors.h"
 #include "webrtc/voice_engine/transmit_mixer.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
 
-#ifndef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
-#error "Deprecated"
-#endif
-
 // TODO(andrew): move to a common place.
 #define WEBRTC_VOICE_INIT_CHECK()                        \
   do {                                                   \
     if (!_shared->statistics().Initialized()) {          \
       _shared->SetLastError(VE_NOT_INITED, kTraceError); \
       return -1;                                         \
     }                                                    \
   } while (0)
 
 #define WEBRTC_VOICE_INIT_CHECK_BOOL()                   \
   do {                                                   \
     if (!_shared->statistics().Initialized()) {          \
       _shared->SetLastError(VE_NOT_INITED, kTraceError); \
       return false;                                      \
     }                                                    \
   } while (0)
 
 namespace webrtc {
 
 #if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
 static const EcModes kDefaultEcMode = kEcAecm;
 #else
 static const EcModes kDefaultEcMode = kEcAec;
 #endif
 
 VoEAudioProcessing* VoEAudioProcessing::GetInterface(VoiceEngine* voiceEngine) {
-#ifndef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
-  return NULL;
-#else
   if (NULL == voiceEngine) {
     return NULL;
   }
   VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
   s->AddRef();
   return s;
-#endif
 }
 
-#ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
 VoEAudioProcessingImpl::VoEAudioProcessingImpl(voe::SharedData* shared)
     : _isAecMode(kDefaultEcMode == kEcAec), _shared(shared) {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "VoEAudioProcessingImpl::VoEAudioProcessingImpl() - ctor");
 }
 
 VoEAudioProcessingImpl::~VoEAudioProcessingImpl() {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
                "VoEAudioProcessingImpl::~VoEAudioProcessingImpl() - dtor");
 }
@@ skipping 699 matching lines @@
 }
 
 void VoEAudioProcessingImpl::EnableStereoChannelSwapping(bool enable) {
   _shared->transmit_mixer()->EnableStereoChannelSwapping(enable);
 }
 
 bool VoEAudioProcessingImpl::IsStereoChannelSwappingEnabled() {
   return _shared->transmit_mixer()->IsStereoChannelSwappingEnabled();
 }
 
-#endif  // #ifdef WEBRTC_VOICE_ENGINE_AUDIO_PROCESSING_API
-
 }  // namespace webrtc