Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Side by Side Diff: webrtc/pc/channelmanager.cc

Issue 1830213002: Remove WVoE::SetAudioDeviceModule() - it is now set in ctor. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: removed Construct() method Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 !SetOutputVolume(audio_output_volume_)) { 171 !SetOutputVolume(audio_output_volume_)) {
172 LOG(LS_WARNING) << "Failed to SetOutputVolume to " 172 LOG(LS_WARNING) << "Failed to SetOutputVolume to "
173 << audio_output_volume_; 173 << audio_output_volume_;
174 } 174 }
175 175
176 return initialized_; 176 return initialized_;
177 } 177 }
178 178
179 bool ChannelManager::InitMediaEngine_w() { 179 bool ChannelManager::InitMediaEngine_w() {
180 ASSERT(worker_thread_ == rtc::Thread::Current()); 180 ASSERT(worker_thread_ == rtc::Thread::Current());
181 return (media_engine_->Init(worker_thread_)); 181 return media_engine_->Init();
182 } 182 }
183 183
184 void ChannelManager::Terminate() { 184 void ChannelManager::Terminate() {
185 ASSERT(initialized_); 185 ASSERT(initialized_);
186 if (!initialized_) { 186 if (!initialized_) {
187 return; 187 return;
188 } 188 }
189 worker_thread_->Invoke<void>(Bind(&ChannelManager::Terminate_w, this)); 189 worker_thread_->Invoke<void>(Bind(&ChannelManager::Terminate_w, this));
190 initialized_ = false; 190 initialized_ = false;
191 } 191 }
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 return worker_thread_->Invoke<bool>( 422 return worker_thread_->Invoke<bool>(
423 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file)); 423 Bind(&MediaEngineInterface::StartRtcEventLog, media_engine_.get(), file));
424 } 424 }
425 425
426 void ChannelManager::StopRtcEventLog() { 426 void ChannelManager::StopRtcEventLog() {
427 worker_thread_->Invoke<void>( 427 worker_thread_->Invoke<void>(
428 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get())); 428 Bind(&MediaEngineInterface::StopRtcEventLog, media_engine_.get()));
429 } 429 }
430 430
431 } // namespace cricket 431 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698