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

Side by Side Diff: webrtc/modules/audio_device/audio_device_impl.cc

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month 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/common_audio/signal_processing/include/signal_processing_librar y.h" 11 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h"
12 #include "webrtc/modules/audio_device/audio_device_config.h" 12 #include "webrtc/modules/audio_device/audio_device_config.h"
13 #include "webrtc/modules/audio_device/audio_device_impl.h" 13 #include "webrtc/modules/audio_device/audio_device_impl.h"
14 #include "webrtc/system_wrappers/interface/ref_count.h" 14 #include "webrtc/system_wrappers/include/ref_count.h"
15 #include "webrtc/system_wrappers/interface/tick_util.h" 15 #include "webrtc/system_wrappers/include/tick_util.h"
16 16
17 #include <assert.h> 17 #include <assert.h>
18 #include <string.h> 18 #include <string.h>
19 19
20 #if defined(_WIN32) 20 #if defined(_WIN32)
21 #include "audio_device_wave_win.h" 21 #include "audio_device_wave_win.h"
22 #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) 22 #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
23 #include "audio_device_core_win.h" 23 #include "audio_device_core_win.h"
24 #endif 24 #endif
25 #elif defined(WEBRTC_ANDROID) 25 #elif defined(WEBRTC_ANDROID)
(...skipping 15 matching lines...) Expand all
41 #elif defined(WEBRTC_MAC) 41 #elif defined(WEBRTC_MAC)
42 #include "audio_device_mac.h" 42 #include "audio_device_mac.h"
43 #endif 43 #endif
44 44
45 #if defined(WEBRTC_DUMMY_FILE_DEVICES) 45 #if defined(WEBRTC_DUMMY_FILE_DEVICES)
46 #include "webrtc/modules/audio_device/dummy/file_audio_device_factory.h" 46 #include "webrtc/modules/audio_device/dummy/file_audio_device_factory.h"
47 #endif 47 #endif
48 48
49 #include "webrtc/modules/audio_device/dummy/audio_device_dummy.h" 49 #include "webrtc/modules/audio_device/dummy/audio_device_dummy.h"
50 #include "webrtc/modules/audio_device/dummy/file_audio_device.h" 50 #include "webrtc/modules/audio_device/dummy/file_audio_device.h"
51 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 51 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
52 #include "webrtc/system_wrappers/interface/trace.h" 52 #include "webrtc/system_wrappers/include/trace.h"
53 53
54 #define CHECK_INITIALIZED() \ 54 #define CHECK_INITIALIZED() \
55 { \ 55 { \
56 if (!_initialized) { \ 56 if (!_initialized) { \
57 return -1; \ 57 return -1; \
58 }; \ 58 }; \
59 } 59 }
60 60
61 #define CHECK_INITIALIZED_BOOL() \ 61 #define CHECK_INITIALIZED_BOOL() \
62 { \ 62 { \
(...skipping 1875 matching lines...) Expand 10 before | Expand all | Expand 10 after
1938 // ---------------------------------------------------------------------------- 1938 // ----------------------------------------------------------------------------
1939 // PlatformAudioLayer 1939 // PlatformAudioLayer
1940 // ---------------------------------------------------------------------------- 1940 // ----------------------------------------------------------------------------
1941 1941
1942 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer() const 1942 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer() const
1943 { 1943 {
1944 return _platformAudioLayer; 1944 return _platformAudioLayer;
1945 } 1945 }
1946 1946
1947 } // namespace webrtc 1947 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/audio_device_buffer.cc ('k') | webrtc/modules/audio_device/dummy/file_audio_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698