| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright 2004 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 DataEngineInterface* dme, | 79 DataEngineInterface* dme, |
| 80 CaptureManager* cm, | 80 CaptureManager* cm, |
| 81 rtc::Thread* worker_thread) { | 81 rtc::Thread* worker_thread) { |
| 82 media_engine_.reset(me); | 82 media_engine_.reset(me); |
| 83 data_media_engine_.reset(dme); | 83 data_media_engine_.reset(dme); |
| 84 capture_manager_.reset(cm); | 84 capture_manager_.reset(cm); |
| 85 initialized_ = false; | 85 initialized_ = false; |
| 86 main_thread_ = rtc::Thread::Current(); | 86 main_thread_ = rtc::Thread::Current(); |
| 87 worker_thread_ = worker_thread; | 87 worker_thread_ = worker_thread; |
| 88 audio_output_volume_ = kNotSetOutputVolume; | 88 audio_output_volume_ = kNotSetOutputVolume; |
| 89 local_renderer_ = NULL; | |
| 90 capturing_ = false; | 89 capturing_ = false; |
| 91 enable_rtx_ = false; | 90 enable_rtx_ = false; |
| 92 | 91 |
| 93 capture_manager_->SignalCapturerStateChange.connect( | 92 capture_manager_->SignalCapturerStateChange.connect( |
| 94 this, &ChannelManager::OnVideoCaptureStateChange); | 93 this, &ChannelManager::OnVideoCaptureStateChange); |
| 95 } | 94 } |
| 96 | 95 |
| 97 ChannelManager::~ChannelManager() { | 96 ChannelManager::~ChannelManager() { |
| 98 if (initialized_) { | 97 if (initialized_) { |
| 99 Terminate(); | 98 Terminate(); |
| (...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 551 return worker_thread_->Invoke<bool>( | 550 return worker_thread_->Invoke<bool>( |
| 552 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); | 551 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); |
| 553 } | 552 } |
| 554 | 553 |
| 555 void ChannelManager::StopRtcEventLog() { | 554 void ChannelManager::StopRtcEventLog() { |
| 556 worker_thread_->Invoke<void>( | 555 worker_thread_->Invoke<void>( |
| 557 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); | 556 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); |
| 558 } | 557 } |
| 559 | 558 |
| 560 } // namespace cricket | 559 } // namespace cricket |
| OLD | NEW |