Remove API-related #defines from voice_engine_configurations.h

webrtc/voice_engine/voe_external_media_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_external_media_impl.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/output_mixer.h"
 #include "webrtc/voice_engine/transmit_mixer.h"
 #include "webrtc/voice_engine/voice_engine_impl.h"
 
-#ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
-#error "Deprecated"
-#endif
-
 namespace webrtc {
 
 VoEExternalMedia* VoEExternalMedia::GetInterface(VoiceEngine* voiceEngine) {
-#ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
-  return NULL;
-#else
   if (NULL == voiceEngine) {
     return NULL;
   }
   VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
   s->AddRef();
   return s;
-#endif
 }
 
-#ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
-
 VoEExternalMediaImpl::VoEExternalMediaImpl(voe::SharedData* shared)
     :
 #ifdef WEBRTC_VOE_EXTERNAL_REC_AND_PLAYOUT
       playout_delay_ms_(0),
 #endif
       shared_(shared) {
   WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(shared_->instance_id(), -1),
                "VoEExternalMediaImpl() - ctor");
 }
 
@@ skipping 124 matching lines @@
   voe::ChannelOwner ch = shared_->channel_manager().GetChannel(channel);
   voe::Channel* channelPtr = ch.channel();
   if (channelPtr == NULL) {
     shared_->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
                           "SetExternalMixing() failed to locate channel");
     return -1;
   }
   return channelPtr->SetExternalMixing(enable);
 }
 
-#endif  // WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
-
 }  // namespace webrtc