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

Side by Side Diff: webrtc/voice_engine/voe_file_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: Fix bug in monitor_module.cc 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_file_impl.h" 11 #include "webrtc/voice_engine/voe_file_impl.h"
12 12
13 #include "webrtc/modules/media_file/media_file.h" 13 #include "webrtc/modules/media_file/media_file.h"
14 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
15 #include "webrtc/system_wrappers/include/file_wrapper.h" 14 #include "webrtc/system_wrappers/include/file_wrapper.h"
16 #include "webrtc/system_wrappers/include/trace.h" 15 #include "webrtc/system_wrappers/include/trace.h"
17 #include "webrtc/voice_engine/channel.h" 16 #include "webrtc/voice_engine/channel.h"
18 #include "webrtc/voice_engine/include/voe_errors.h" 17 #include "webrtc/voice_engine/include/voe_errors.h"
19 #include "webrtc/voice_engine/output_mixer.h" 18 #include "webrtc/voice_engine/output_mixer.h"
20 #include "webrtc/voice_engine/transmit_mixer.h" 19 #include "webrtc/voice_engine/transmit_mixer.h"
21 #include "webrtc/voice_engine/voice_engine_impl.h" 20 #include "webrtc/voice_engine/voice_engine_impl.h"
22 21
23 namespace webrtc { 22 namespace webrtc {
24 23
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 "StopRecordingMicrophone() failed to stop recording to mixer"); 466 "StopRecordingMicrophone() failed to stop recording to mixer");
468 err = -1; 467 err = -1;
469 } 468 }
470 469
471 return err; 470 return err;
472 } 471 }
473 472
474 #endif // #ifdef WEBRTC_VOICE_ENGINE_FILE_API 473 #endif // #ifdef WEBRTC_VOICE_ENGINE_FILE_API
475 474
476 } // namespace webrtc 475 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/voice_engine/voe_external_media_impl.cc ('k') | webrtc/voice_engine/voe_hardware_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698