This issue is related to
https://chromereviews.googleplex.com/9908014/
I was thinking about shipping ACM2 from the signal repository. There seems to be too many changes in one CL.
BUG=
R=andrew@webrtc.org, turaj@webrtc.org, xians@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2171004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4733 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/voice_engine/channel_manager.cc b/voice_engine/channel_manager.cc
index 8110bb6..b56c54a 100644
--- a/voice_engine/channel_manager.cc
+++ b/voice_engine/channel_manager.cc
@@ -44,14 +44,15 @@
ChannelOwner::ChannelRef::ChannelRef(class Channel* channel)
: channel(channel), ref_count(1) {}
-ChannelManager::ChannelManager(uint32_t instance_id)
+ChannelManager::ChannelManager(uint32_t instance_id, const Config& config)
: instance_id_(instance_id),
last_channel_id_(-1),
- lock_(CriticalSectionWrapper::CreateCriticalSection()) {}
+ lock_(CriticalSectionWrapper::CreateCriticalSection()),
+ config_(config) {}
ChannelOwner ChannelManager::CreateChannel() {
Channel* channel;
- Channel::CreateChannel(channel, ++last_channel_id_, instance_id_);
+ Channel::CreateChannel(channel, ++last_channel_id_, instance_id_, config_);
ChannelOwner channel_owner(channel);
CriticalSectionScoped crit(lock_.get());