| 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 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H | 11 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H |
| 12 #define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H | 12 #define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H |
| 13 | 13 |
| 14 #include <vector> | 14 #include <vector> |
| 15 | 15 |
| 16 #include "webrtc/base/constructormagic.h" | 16 #include "webrtc/base/constructormagic.h" |
| 17 #include "webrtc/base/scoped_ptr.h" | 17 #include "webrtc/base/scoped_ptr.h" |
| 18 #include "webrtc/call/rtc_event_log.h" |
| 18 #include "webrtc/system_wrappers/interface/atomic32.h" | 19 #include "webrtc/system_wrappers/interface/atomic32.h" |
| 19 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 20 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" |
| 20 #include "webrtc/typedefs.h" | 21 #include "webrtc/typedefs.h" |
| 21 #include "webrtc/video/rtc_event_log.h" | |
| 22 | 22 |
| 23 namespace webrtc { | 23 namespace webrtc { |
| 24 | 24 |
| 25 class Config; | 25 class Config; |
| 26 | 26 |
| 27 namespace voe { | 27 namespace voe { |
| 28 | 28 |
| 29 class Channel; | 29 class Channel; |
| 30 | 30 |
| 31 // Shared-pointer implementation for keeping track of Channels. The underlying | 31 // Shared-pointer implementation for keeping track of Channels. The underlying |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 |