| OLD | NEW |
| 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 <memory> | 14 #include <memory> |
| 15 | 15 |
| 16 #include "webrtc/base/criticalsection.h" |
| 17 #include "webrtc/base/platform_thread.h" |
| 16 #include "webrtc/modules/audio_device/audio_device_generic.h" | 18 #include "webrtc/modules/audio_device/audio_device_generic.h" |
| 17 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" | 19 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h" |
| 18 #include "webrtc/rtc_base/criticalsection.h" | |
| 19 #include "webrtc/rtc_base/platform_thread.h" | |
| 20 | 20 |
| 21 #if defined(USE_X11) | 21 #if defined(USE_X11) |
| 22 #include <X11/Xlib.h> | 22 #include <X11/Xlib.h> |
| 23 #endif | 23 #endif |
| 24 #include <alsa/asoundlib.h> | 24 #include <alsa/asoundlib.h> |
| 25 #include <sys/ioctl.h> | 25 #include <sys/ioctl.h> |
| 26 #include <sys/soundcard.h> | 26 #include <sys/soundcard.h> |
| 27 | 27 |
| 28 | 28 |
| 29 namespace webrtc | 29 namespace webrtc |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 | 240 |
| 241 char _oldKeyState[32]; | 241 char _oldKeyState[32]; |
| 242 #if defined(USE_X11) | 242 #if defined(USE_X11) |
| 243 Display* _XDisplay; | 243 Display* _XDisplay; |
| 244 #endif | 244 #endif |
| 245 }; | 245 }; |
| 246 | 246 |
| 247 } | 247 } |
| 248 | 248 |
| 249 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_ALSA_LINUX_H_ | 249 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_ALSA_LINUX_H_ |
| OLD | NEW |