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

Side by Side Diff: webrtc/voice_engine/voe_volume_control_impl.cc

Issue 1607353002: Swap use of CriticalSectionWrapper with rtc::CriticalSection in voice_engine/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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 (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 #include "webrtc/voice_engine/voe_volume_control_impl.h" 11 #include "webrtc/voice_engine/voe_volume_control_impl.h"
12 12
13 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
14 #include "webrtc/system_wrappers/include/trace.h" 13 #include "webrtc/system_wrappers/include/trace.h"
15 #include "webrtc/voice_engine/channel.h" 14 #include "webrtc/voice_engine/channel.h"
16 #include "webrtc/voice_engine/include/voe_errors.h" 15 #include "webrtc/voice_engine/include/voe_errors.h"
17 #include "webrtc/voice_engine/output_mixer.h" 16 #include "webrtc/voice_engine/output_mixer.h"
18 #include "webrtc/voice_engine/transmit_mixer.h" 17 #include "webrtc/voice_engine/transmit_mixer.h"
19 #include "webrtc/voice_engine/voice_engine_impl.h" 18 #include "webrtc/voice_engine/voice_engine_impl.h"
20 19
21 namespace webrtc { 20 namespace webrtc {
22 21
23 VoEVolumeControl* VoEVolumeControl::GetInterface(VoiceEngine* voiceEngine) { 22 VoEVolumeControl* VoEVolumeControl::GetInterface(VoiceEngine* voiceEngine) {
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError, 410 _shared->SetLastError(VE_CHANNEL_NOT_VALID, kTraceError,
412 "GetOutputVolumePan() failed to locate channel"); 411 "GetOutputVolumePan() failed to locate channel");
413 return -1; 412 return -1;
414 } 413 }
415 return channelPtr->GetOutputVolumePan(left, right); 414 return channelPtr->GetOutputVolumePan(left, right);
416 } 415 }
417 416
418 #endif // #ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API 417 #endif // #ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
419 418
420 } // namespace webrtc 419 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698