| Index: webrtc/voice_engine/channel_manager.cc
|
| diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc
|
| index 76664d4b12ccd9becadd39f81363fc6b72a8e38c..8452c8b63dbb5a259eebe2f210215c079c69266f 100644
|
| --- a/webrtc/voice_engine/channel_manager.cc
|
| +++ b/webrtc/voice_engine/channel_manager.cc
|
| @@ -49,7 +49,8 @@ ChannelManager::ChannelManager(uint32_t instance_id, const Config& config)
|
| : instance_id_(instance_id),
|
| last_channel_id_(-1),
|
| lock_(CriticalSectionWrapper::CreateCriticalSection()),
|
| - config_(config) {}
|
| + config_(config),
|
| + event_log_(RtcEventLog::Create()) {}
|
|
|
| ChannelOwner ChannelManager::CreateChannel() {
|
| return CreateChannelInternal(config_);
|
| @@ -61,7 +62,8 @@ ChannelOwner ChannelManager::CreateChannel(const Config& external_config) {
|
|
|
| ChannelOwner ChannelManager::CreateChannelInternal(const Config& config) {
|
| Channel* channel;
|
| - Channel::CreateChannel(channel, ++last_channel_id_, instance_id_, config);
|
| + Channel::CreateChannel(channel, ++last_channel_id_, instance_id_,
|
| + event_log_.get(), config);
|
| ChannelOwner channel_owner(channel);
|
|
|
| CriticalSectionScoped crit(lock_.get());
|
| @@ -128,6 +130,10 @@ size_t ChannelManager::NumOfChannels() const {
|
| return channels_.size();
|
| }
|
|
|
| +RtcEventLog* ChannelManager::GetEventLog() const {
|
| + return event_log_.get();
|
| +}
|
| +
|
| ChannelManager::Iterator::Iterator(ChannelManager* channel_manager)
|
| : iterator_pos_(0) {
|
| channel_manager->GetAllChannels(&channels_);
|
|
|