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

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

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: Created 3 years, 5 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 #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/rtc_base/thread_checker.h"
17 #include "webrtc/typedefs.h" 16 #include "webrtc/typedefs.h"
17 #include "webrtc/base/thread_checker.h"
18 18
19 #include <pulse/pulseaudio.h> 19 #include <pulse/pulseaudio.h>
20 #include <stdint.h> 20 #include <stdint.h>
21 21
22 #ifndef UINT32_MAX 22 #ifndef UINT32_MAX
23 #define UINT32_MAX ((uint32_t)-1) 23 #define UINT32_MAX ((uint32_t)-1)
24 #endif 24 #endif
25 25
26 namespace webrtc 26 namespace webrtc
27 { 27 {
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // Stores thread ID in constructor. 110 // Stores thread ID in constructor.
111 // We can then use ThreadChecker::CalledOnValidThread() to ensure that 111 // We can then use ThreadChecker::CalledOnValidThread() to ensure that
112 // other methods are called from the same thread. 112 // other methods are called from the same thread.
113 // Currently only does RTC_DCHECK(thread_checker_.CalledOnValidThread()). 113 // Currently only does RTC_DCHECK(thread_checker_.CalledOnValidThread()).
114 rtc::ThreadChecker thread_checker_; 114 rtc::ThreadChecker thread_checker_;
115 }; 115 };
116 116
117 } 117 }
118 118
119 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_MIXER_MANAGER_PULSE_LINU X_H_ 119 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_MIXER_MANAGER_PULSE_LINU X_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698