| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2004 Google Inc. | 3 * Copyright 2004 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 DataEngineInterface* dme, | 96 DataEngineInterface* dme, |
| 97 CaptureManager* cm, | 97 CaptureManager* cm, |
| 98 rtc::Thread* worker_thread) { | 98 rtc::Thread* worker_thread) { |
| 99 media_engine_.reset(me); | 99 media_engine_.reset(me); |
| 100 data_media_engine_.reset(dme); | 100 data_media_engine_.reset(dme); |
| 101 capture_manager_.reset(cm); | 101 capture_manager_.reset(cm); |
| 102 initialized_ = false; | 102 initialized_ = false; |
| 103 main_thread_ = rtc::Thread::Current(); | 103 main_thread_ = rtc::Thread::Current(); |
| 104 worker_thread_ = worker_thread; | 104 worker_thread_ = worker_thread; |
| 105 audio_output_volume_ = kNotSetOutputVolume; | 105 audio_output_volume_ = kNotSetOutputVolume; |
| 106 local_renderer_ = NULL; |
| 106 capturing_ = false; | 107 capturing_ = false; |
| 107 enable_rtx_ = false; | 108 enable_rtx_ = false; |
| 108 | 109 |
| 109 capture_manager_->SignalCapturerStateChange.connect( | 110 capture_manager_->SignalCapturerStateChange.connect( |
| 110 this, &ChannelManager::OnVideoCaptureStateChange); | 111 this, &ChannelManager::OnVideoCaptureStateChange); |
| 111 } | 112 } |
| 112 | 113 |
| 113 ChannelManager::~ChannelManager() { | 114 ChannelManager::~ChannelManager() { |
| 114 if (initialized_) { | 115 if (initialized_) { |
| 115 Terminate(); | 116 Terminate(); |
| (...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 567 return worker_thread_->Invoke<bool>( | 568 return worker_thread_->Invoke<bool>( |
| 568 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); | 569 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); |
| 569 } | 570 } |
| 570 | 571 |
| 571 void ChannelManager::StopRtcEventLog() { | 572 void ChannelManager::StopRtcEventLog() { |
| 572 worker_thread_->Invoke<void>( | 573 worker_thread_->Invoke<void>( |
| 573 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); | 574 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); |
| 574 } | 575 } |
| 575 | 576 |
| 576 } // namespace cricket | 577 } // namespace cricket |
| OLD | NEW |