| 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 |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 RtcEventLog* GetEventLog() const; | 116 RtcEventLog* GetEventLog() const; |
| 117 | 117 |
| 118 private: | 118 private: |
| 119 // Create a channel given a configuration, |config|. | 119 // Create a channel given a configuration, |config|. |
| 120 ChannelOwner CreateChannelInternal(const Config& config); | 120 ChannelOwner CreateChannelInternal(const Config& config); |
| 121 | 121 |
| 122 uint32_t instance_id_; | 122 uint32_t instance_id_; |
| 123 | 123 |
| 124 Atomic32 last_channel_id_; | 124 Atomic32 last_channel_id_; |
| 125 | 125 |
| 126 mutable rtc::CriticalSection lock_; | 126 rtc::CriticalSection lock_; |
| 127 std::vector<ChannelOwner> channels_; | 127 std::vector<ChannelOwner> channels_; |
| 128 | 128 |
| 129 const Config& config_; | 129 const Config& config_; |
| 130 rtc::scoped_ptr<RtcEventLog> event_log_; | 130 rtc::scoped_ptr<RtcEventLog> event_log_; |
| 131 | 131 |
| 132 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager); | 132 RTC_DISALLOW_COPY_AND_ASSIGN(ChannelManager); |
| 133 }; | 133 }; |
| 134 } // namespace voe | 134 } // namespace voe |
| 135 } // namespace webrtc | 135 } // namespace webrtc |
| 136 | 136 |
| 137 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H | 137 #endif // WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H |
| OLD | NEW |