Remove WEBRTC_*_ENGINE_NETWORK_API use
Review URL: https://webrtc-codereview.appspot.com/1203009
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3767 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/engine_configurations.h b/engine_configurations.h
index bfc20cf..01fa364 100644
--- a/engine_configurations.h
+++ b/engine_configurations.h
@@ -15,14 +15,6 @@
// Voice and Video
// ============================================================================
-// Don't link in socket support in Chrome
-#ifdef WEBRTC_CHROMIUM_BUILD
-#define WEBRTC_EXTERNAL_TRANSPORT
-#endif
-
-// Optional to enable stand-alone
-// #define WEBRTC_EXTERNAL_TRANSPORT
-
// ----------------------------------------------------------------------------
// [Voice] Codec settings
// ----------------------------------------------------------------------------
@@ -84,7 +76,6 @@
#define WEBRTC_VOICE_ENGINE_FILE_API
#define WEBRTC_VOICE_ENGINE_HARDWARE_API
#define WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
-#define WEBRTC_VOICE_ENGINE_NETWORK_API
#define WEBRTC_VOICE_ENGINE_RTP_RTCP_API
#define WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
#define WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
@@ -109,7 +100,6 @@
#define WEBRTC_VIDEO_ENGINE_CODEC_API
#define WEBRTC_VIDEO_ENGINE_ENCRYPTION_API
#define WEBRTC_VIDEO_ENGINE_IMAGE_PROCESS_API
-#define WEBRTC_VIDEO_ENGINE_NETWORK_API
#define WEBRTC_VIDEO_ENGINE_RENDER_API
#define WEBRTC_VIDEO_ENGINE_RTP_RTCP_API
#define WEBRTC_VIDEO_ENGINE_EXTERNAL_CODEC_API
diff --git a/video_engine/vie_network_impl.cc b/video_engine/vie_network_impl.cc
index e22f7ce..47397c8 100644
--- a/video_engine/vie_network_impl.cc
+++ b/video_engine/vie_network_impl.cc
@@ -28,7 +28,6 @@
namespace webrtc {
ViENetwork* ViENetwork::GetInterface(VideoEngine* video_engine) {
-#ifdef WEBRTC_VIDEO_ENGINE_NETWORK_API
if (!video_engine) {
return NULL;
}
@@ -37,9 +36,6 @@
// Increase ref count.
(*vie_networkImpl)++;
return vie_networkImpl;
-#else
- return NULL;
-#endif
}
int ViENetworkImpl::Release() {
diff --git a/voice_engine/test/auto_test/voe_standard_test.h b/voice_engine/test/auto_test/voe_standard_test.h
index 6a58d7b..b64a792 100644
--- a/voice_engine/test/auto_test/voe_standard_test.h
+++ b/voice_engine/test/auto_test/voe_standard_test.h
@@ -39,9 +39,7 @@
#ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
#include "voe_hardware.h"
#endif
-#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API
#include "voe_network.h"
-#endif
#ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
#include "voe_video_sync.h"
#endif
@@ -107,9 +105,7 @@
#ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
_netEqStats = true;
#endif
-#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API
_network = true;
-#endif
#ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
_rtp_rtcp = true;
#endif
diff --git a/voice_engine/test/auto_test/voe_test_defines.h b/voice_engine/test/auto_test/voe_test_defines.h
index 2954fe6..e71f3cf 100644
--- a/voice_engine/test/auto_test/voe_test_defines.h
+++ b/voice_engine/test/auto_test/voe_test_defines.h
@@ -90,9 +90,6 @@
#ifndef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
#undef _TEST_XMEDIA_
#endif
-#ifndef WEBRTC_VOICE_ENGINE_NETWORK_API
-#undef _TEST_NETWORK_
-#endif
#ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
#undef _TEST_NETEQ_STATS_
#endif
diff --git a/voice_engine/voe_network_impl.cc b/voice_engine/voe_network_impl.cc
index 6c4cfc2..f3722f0 100644
--- a/voice_engine/voe_network_impl.cc
+++ b/voice_engine/voe_network_impl.cc
@@ -21,9 +21,6 @@
VoENetwork* VoENetwork::GetInterface(VoiceEngine* voiceEngine)
{
-#ifndef WEBRTC_VOICE_ENGINE_NETWORK_API
- return NULL;
-#else
if (NULL == voiceEngine)
{
return NULL;
@@ -31,11 +28,8 @@
VoiceEngineImpl* s = static_cast<VoiceEngineImpl*>(voiceEngine);
s->AddRef();
return s;
-#endif
}
-#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API
-
VoENetworkImpl::VoENetworkImpl(voe::SharedData* shared) : _shared(shared)
{
WEBRTC_TRACE(kTraceMemory, kTraceVoice, VoEId(_shared->instance_id(), -1),
@@ -323,6 +317,4 @@
sampleTimeSeconds);
}
-#endif // WEBRTC_VOICE_ENGINE_NETWORK_API
-
} // namespace webrtc
diff --git a/voice_engine/voice_engine_impl.h b/voice_engine/voice_engine_impl.h
index 2b3963c..4666883 100644
--- a/voice_engine/voice_engine_impl.h
+++ b/voice_engine/voice_engine_impl.h
@@ -42,9 +42,7 @@
#ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
#include "voe_neteq_stats_impl.h"
#endif
-#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API
#include "voe_network_impl.h"
-#endif
#ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
#include "voe_rtp_rtcp_impl.h"
#endif
@@ -87,9 +85,7 @@
#ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
public VoENetEqStatsImpl,
#endif
-#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API
public VoENetworkImpl,
-#endif
#ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
public VoERTP_RTCPImpl,
#endif
@@ -130,9 +126,7 @@
#ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
VoENetEqStatsImpl(this),
#endif
-#ifdef WEBRTC_VOICE_ENGINE_NETWORK_API
VoENetworkImpl(this),
-#endif
#ifdef WEBRTC_VOICE_ENGINE_RTP_RTCP_API
VoERTP_RTCPImpl(this),
#endif