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

Unified Diff: webrtc/voice_engine/voe_hardware_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_file_impl.cc ('k') | webrtc/voice_engine/voe_neteq_stats_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/voice_engine/voe_hardware_impl.cc
diff --git a/webrtc/voice_engine/voe_hardware_impl.cc b/webrtc/voice_engine/voe_hardware_impl.cc
index 6bf493fe13a751a5c1f013b88dc6541a19799397..1748fc2309d81bd6edc4c067c1d84c8eba0c8768 100644
--- a/webrtc/voice_engine/voe_hardware_impl.cc
+++ b/webrtc/voice_engine/voe_hardware_impl.cc
@@ -16,27 +16,17 @@
#include "webrtc/voice_engine/include/voe_errors.h"
#include "webrtc/voice_engine/voice_engine_impl.h"
-#ifndef WEBRTC_VOICE_ENGINE_HARDWARE_API
-#error "Deprecated"
-#endif
-
namespace webrtc {
VoEHardware* VoEHardware::GetInterface(VoiceEngine* voiceEngine) {
-#ifndef WEBRTC_VOICE_ENGINE_HARDWARE_API
- return NULL;
-#else
if (NULL == voiceEngine) {
return NULL;
}
VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
s->AddRef();
return s;
-#endif
}
-#ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
-
VoEHardwareImpl::VoEHardwareImpl(voe::SharedData* shared) : _shared(shared) {
WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
"VoEHardwareImpl() - ctor");
@@ -515,6 +505,4 @@ int VoEHardwareImpl::EnableBuiltInNS(bool enable) {
return _shared->audio_device()->EnableBuiltInNS(enable);
}
-#endif // WEBRTC_VOICE_ENGINE_HARDWARE_API
-
} // namespace webrtc
« no previous file with comments | « webrtc/voice_engine/voe_file_impl.cc ('k') | webrtc/voice_engine/voe_neteq_stats_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698