summaryrefslogtreecommitdiff
path: root/voice_engine/voice_engine_impl.h
diff options
context:
space:
mode:
authorsolenberg@webrtc.org <solenberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-02-18 11:27:22 +0000
committersolenberg@webrtc.org <solenberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>2014-02-18 11:27:22 +0000
commita56c5b4327c6a89238ee5b1ffd3ace78b20afaef (patch)
tree415052fb015da98f1722fb0d03fa6764640eb301 /voice_engine/voice_engine_impl.h
parent3e4cdeca70f8a9499fb746fa4e9a094a449dda86 (diff)
downloadwebrtc-a56c5b4327c6a89238ee5b1ffd3ace78b20afaef.tar.gz
Remove external encryption API for VoE.
BUG= R=henrika@webrtc.org, henrikg@webrtc.org, phoglund@webrtc.org Review URL: https://webrtc-codereview.appspot.com/8459004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@5564 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voice_engine_impl.h')
-rw-r--r--voice_engine/voice_engine_impl.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/voice_engine/voice_engine_impl.h b/voice_engine/voice_engine_impl.h
index fe6a7915..ffdf5910 100644
--- a/voice_engine/voice_engine_impl.h
+++ b/voice_engine/voice_engine_impl.h
@@ -27,9 +27,6 @@
#ifdef WEBRTC_VOICE_ENGINE_DTMF_API
#include "webrtc/voice_engine/voe_dtmf_impl.h"
#endif
-#ifdef WEBRTC_VOICE_ENGINE_ENCRYPTION_API
-#include "webrtc/voice_engine/voe_encryption_impl.h"
-#endif
#ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
#include "webrtc/voice_engine/voe_external_media_impl.h"
#endif
@@ -70,9 +67,6 @@ class VoiceEngineImpl : public voe::SharedData, // Must be the first base class
#ifdef WEBRTC_VOICE_ENGINE_DTMF_API
public VoEDtmfImpl,
#endif
-#ifdef WEBRTC_VOICE_ENGINE_ENCRYPTION_API
- public VoEEncryptionImpl,
-#endif
#ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
public VoEExternalMediaImpl,
#endif
@@ -112,9 +106,6 @@ public:
#ifdef WEBRTC_VOICE_ENGINE_DTMF_API
VoEDtmfImpl(this),
#endif
-#ifdef WEBRTC_VOICE_ENGINE_ENCRYPTION_API
- VoEEncryptionImpl(this),
-#endif
#ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
VoEExternalMediaImpl(this),
#endif