Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: webrtc/voice_engine/voe_external_media_impl.cc

Issue 2549443002: Remove API-related #defines from voice_engine_configurations.h (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/voice_engine/voe_codec_impl.cc ('k') | webrtc/voice_engine/voe_file_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voe_external_media_impl.cc
diff --git a/webrtc/voice_engine/voe_external_media_impl.cc b/webrtc/voice_engine/voe_external_media_impl.cc
index 72dd3b1fd6247621b98be5b517137fc1584ff258..6f02495e5c578453388779d2e0ef2c696faa3505 100644
--- a/webrtc/voice_engine/voe_external_media_impl.cc
+++ b/webrtc/voice_engine/voe_external_media_impl.cc
@@ -17,27 +17,17 @@
#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
@@ -182,6 +172,4 @@ int VoEExternalMediaImpl::SetExternalMixing(int channel, bool enable) {
return channelPtr->SetExternalMixing(enable);
}
-#endif // WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
-
} // namespace webrtc
« no previous file with comments | « webrtc/voice_engine/voe_codec_impl.cc ('k') | webrtc/voice_engine/voe_file_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698