| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| 11 #include "webrtc/voice_engine/channel_manager.h" | 11 #include "webrtc/voice_engine/channel_manager.h" | 
| 12 | 12 | 
| 13 #include "webrtc/rtc_base/timeutils.h" | 13 #include "webrtc/base/timeutils.h" | 
| 14 #include "webrtc/voice_engine/channel.h" | 14 #include "webrtc/voice_engine/channel.h" | 
| 15 | 15 | 
| 16 namespace webrtc { | 16 namespace webrtc { | 
| 17 namespace voe { | 17 namespace voe { | 
| 18 | 18 | 
| 19 ChannelOwner::ChannelOwner(class Channel* channel) | 19 ChannelOwner::ChannelOwner(class Channel* channel) | 
| 20     : channel_ref_(new ChannelRef(channel)) {} | 20     : channel_ref_(new ChannelRef(channel)) {} | 
| 21 | 21 | 
| 22 ChannelOwner::ChannelOwner(const ChannelOwner& channel_owner) | 22 ChannelOwner::ChannelOwner(const ChannelOwner& channel_owner) | 
| 23     : channel_ref_(channel_owner.channel_ref_) { | 23     : channel_ref_(channel_owner.channel_ref_) { | 
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 148 bool ChannelManager::Iterator::IsValid() { | 148 bool ChannelManager::Iterator::IsValid() { | 
| 149   return iterator_pos_ < channels_.size(); | 149   return iterator_pos_ < channels_.size(); | 
| 150 } | 150 } | 
| 151 | 151 | 
| 152 void ChannelManager::Iterator::Increment() { | 152 void ChannelManager::Iterator::Increment() { | 
| 153   ++iterator_pos_; | 153   ++iterator_pos_; | 
| 154 } | 154 } | 
| 155 | 155 | 
| 156 }  // namespace voe | 156 }  // namespace voe | 
| 157 }  // namespace webrtc | 157 }  // namespace webrtc | 
| OLD | NEW | 
|---|