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

Side by Side Diff: webrtc/modules/audio_device/linux/audio_device_alsa_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_DEVICE_ALSA_LINUX_H 11 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H
12 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H 12 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H
13 13
14 #include "webrtc/modules/audio_device/audio_device_generic.h" 14 #include "webrtc/modules/audio_device/audio_device_generic.h"
15 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" 15 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_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/system_wrappers/interface/thread_wrapper.h" 17 #include "webrtc/system_wrappers/include/thread_wrapper.h"
18 18
19 #if defined(USE_X11) 19 #if defined(USE_X11)
20 #include <X11/Xlib.h> 20 #include <X11/Xlib.h>
21 #endif 21 #endif
22 #include <alsa/asoundlib.h> 22 #include <alsa/asoundlib.h>
23 #include <sys/ioctl.h> 23 #include <sys/ioctl.h>
24 #include <sys/soundcard.h> 24 #include <sys/soundcard.h>
25 25
26 26
27 namespace webrtc 27 namespace webrtc
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 243
244 char _oldKeyState[32]; 244 char _oldKeyState[32];
245 #if defined(USE_X11) 245 #if defined(USE_X11)
246 Display* _XDisplay; 246 Display* _XDisplay;
247 #endif 247 #endif
248 }; 248 };
249 249
250 } 250 }
251 251
252 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_ALSA_LINUX_H_ 252 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_ALSA_LINUX_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698