Index: webrtc/voice_engine/voe_volume_control_impl.cc |
diff --git a/webrtc/voice_engine/voe_volume_control_impl.cc b/webrtc/voice_engine/voe_volume_control_impl.cc |
index 5e8f0d7fbb0d5bedf77f4af62da60e2d6a2768a5..0d79c6c6812616a64f5e80feedb27d727803aac2 100644 |
--- a/webrtc/voice_engine/voe_volume_control_impl.cc |
+++ b/webrtc/voice_engine/voe_volume_control_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_VOLUME_CONTROL_API |
-#error "Deprecated" |
-#endif |
- |
namespace webrtc { |
VoEVolumeControl* VoEVolumeControl::GetInterface(VoiceEngine* voiceEngine) { |
-#ifndef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API |
- return NULL; |
-#else |
if (NULL == voiceEngine) { |
return NULL; |
} |
VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine); |
s->AddRef(); |
return s; |
-#endif |
} |
-#ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API |
- |
VoEVolumeControlImpl::VoEVolumeControlImpl(voe::SharedData* shared) |
: _shared(shared) { |
WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1), |
@@ -418,6 +408,4 @@ int VoEVolumeControlImpl::GetOutputVolumePan(int channel, |
return channelPtr->GetOutputVolumePan(left, right); |
} |
-#endif // #ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API |
- |
} // namespace webrtc |