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

Side by Side Diff: webrtc/modules/audio_device/linux/audio_mixer_manager_pulse_linux.h

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 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H 11 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H
12 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H 12 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_PULSE_LINUX_H
13 13
14 #include "webrtc/modules/audio_device/include/audio_device.h" 14 #include "webrtc/modules/audio_device/include/audio_device.h"
15 #include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h" 15 #include "webrtc/modules/audio_device/linux/pulseaudiosymboltable_linux.h"
16 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 16 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
17 #include "webrtc/typedefs.h" 17 #include "webrtc/typedefs.h"
18 #include "webrtc/base/thread_checker.h" 18 #include "webrtc/base/thread_checker.h"
19 19
20 #include <pulse/pulseaudio.h> 20 #include <pulse/pulseaudio.h>
21 #include <stdint.h> 21 #include <stdint.h>
22 22
23 #ifndef UINT32_MAX 23 #ifndef UINT32_MAX
24 #define UINT32_MAX ((uint32_t)-1) 24 #define UINT32_MAX ((uint32_t)-1)
25 #endif 25 #endif
26 26
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 // Stores thread ID in constructor. 111 // Stores thread ID in constructor.
112 // We can then use ThreadChecker::CalledOnValidThread() to ensure that 112 // We can then use ThreadChecker::CalledOnValidThread() to ensure that
113 // other methods are called from the same thread. 113 // other methods are called from the same thread.
114 // Currently only does RTC_DCHECK(thread_checker_.CalledOnValidThread()). 114 // Currently only does RTC_DCHECK(thread_checker_.CalledOnValidThread()).
115 rtc::ThreadChecker thread_checker_; 115 rtc::ThreadChecker thread_checker_;
116 }; 116 };
117 117
118 } 118 }
119 119
120 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_MIXER_MANAGER_PULSE_LINU X_H_ 120 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_MIXER_MANAGER_PULSE_LINU X_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698