Moving/renaming webrtc/common.h.

webrtc/voice_engine/voice_engine_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 11 matching lines @@
 #include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc {
 
 // Counter to be ensure that we can add a correct ID in all static trace
 // methods. It is not the nicest solution, especially not since we already
 // have a counter in VoEBaseImpl. In other words, there is room for
 // improvement here.
 static int32_t gVoiceEngineInstanceCounter = 0;
 
-VoiceEngine* GetVoiceEngine(const Config* config, bool owns_config) {
-  VoiceEngineImpl* self = new VoiceEngineImpl(config, owns_config);
+VoiceEngine* GetVoiceEngine() {
+  VoiceEngineImpl* self = new VoiceEngineImpl();
   if (self != NULL) {
     self->AddRef();  // First reference.  Released in VoiceEngine::Delete.
     gVoiceEngineInstanceCounter++;
   }
   return self;
 }
 
 int VoiceEngineImpl::AddRef() {
   return ++_ref_count;
 }
@@ skipping 21 matching lines @@
 std::unique_ptr<voe::ChannelProxy> VoiceEngineImpl::GetChannelProxy(
     int channel_id) {
   RTC_DCHECK(channel_id >= 0);
   rtc::CritScope cs(crit_sec());
   RTC_DCHECK(statistics().Initialized());
   return std::unique_ptr<voe::ChannelProxy>(
       new voe::ChannelProxy(channel_manager().GetChannel(channel_id)));
 }
 
 VoiceEngine* VoiceEngine::Create() {
-  Config* config = new Config();
-  return GetVoiceEngine(config, true);
-}
-
-VoiceEngine* VoiceEngine::Create(const Config& config) {
-  return GetVoiceEngine(&config, false);
+  return GetVoiceEngine();
 }
 
 int VoiceEngine::SetTraceFilter(unsigned int filter) {
   WEBRTC_TRACE(kTraceApiCall, kTraceVoice,
                VoEId(gVoiceEngineInstanceCounter, -1),
                "SetTraceFilter(filter=0x%x)", filter);
 
   // Remember old filter
   uint32_t oldFilter = Trace::level_filter();
   Trace::set_level_filter(filter);
@@ skipping 58 matching lines @@
 
 std::string VoiceEngine::GetVersionString() {
   std::string version = "VoiceEngine 4.1.0";
 #ifdef WEBRTC_EXTERNAL_TRANSPORT
   version += " (External transport build)";
 #endif
   return version;
 }
 
 }  // namespace webrtc