Moving/renaming webrtc/common.h.

webrtc/voice_engine/channel_manager.cc

 /*
  *  Copyright (c) 2011 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.
  */
 
 #include "webrtc/voice_engine/channel_manager.h"
 
-#include "webrtc/common.h"
 #include "webrtc/voice_engine/channel.h"
 
 namespace webrtc {
 namespace voe {
 
 ChannelOwner::ChannelOwner(class Channel* channel)
     : channel_ref_(new ChannelRef(channel)) {}
 
 ChannelOwner::ChannelOwner(const ChannelOwner& channel_owner)
     : channel_ref_(channel_owner.channel_ref_) {
@@ skipping 14 matching lines @@
 
   channel_ref_ = other.channel_ref_;
   ++channel_ref_->ref_count;
 
   return *this;
 }
 
 ChannelOwner::ChannelRef::ChannelRef(class Channel* channel)
     : channel(channel), ref_count(1) {}
 
-ChannelManager::ChannelManager(uint32_t instance_id, const Config& config)
-    : instance_id_(instance_id), last_channel_id_(-1), config_(config) {}
+ChannelManager::ChannelManager(uint32_t instance_id)
+    : instance_id_(instance_id), last_channel_id_(-1) {}
 
 ChannelOwner ChannelManager::CreateChannel(
-    const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory) {
-  return CreateChannelInternal(config_, decoder_factory);
-}
-
-ChannelOwner ChannelManager::CreateChannel(
-    const Config& external_config,
-    const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory) {
-  return CreateChannelInternal(external_config, decoder_factory);
-}
-
-ChannelOwner ChannelManager::CreateChannelInternal(
-    const Config& config,
-    const rtc::scoped_refptr<AudioDecoderFactory>& decoder_factory) {
+    const VoEBase::ChannelConfig& config) {
   Channel* channel;
-  Channel::CreateChannel(channel, ++last_channel_id_, instance_id_, config,
-                         decoder_factory);
+  Channel::CreateChannel(channel, ++last_channel_id_, instance_id_, config);
   ChannelOwner channel_owner(channel);
 
   rtc::CritScope crit(&lock_);
 
   channels_.push_back(channel_owner);
 
   return channel_owner;
 }
 
 ChannelOwner ChannelManager::GetChannel(int32_t channel_id) {
@@ skipping 67 matching lines @@
 bool ChannelManager::Iterator::IsValid() {
   return iterator_pos_ < channels_.size();
 }
 
 void ChannelManager::Iterator::Increment() {
   ++iterator_pos_;
 }
 
 }  // namespace voe
 }  // namespace webrtc