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

Side by Side Diff: webrtc/modules/audio_device/linux/audio_mixer_manager_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) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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_ALSA_LINUX_H 11 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H
12 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H 12 #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_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/alsasymboltable_linux.h" 15 #include "webrtc/modules/audio_device/linux/alsasymboltable_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 18
19 #include <alsa/asoundlib.h> 19 #include <alsa/asoundlib.h>
20 20
21 namespace webrtc 21 namespace webrtc
22 { 22 {
23 23
24 class AudioMixerManagerLinuxALSA 24 class AudioMixerManagerLinuxALSA
25 { 25 {
26 public: 26 public:
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 char _outputMixerStr[kAdmMaxDeviceNameSize]; 69 char _outputMixerStr[kAdmMaxDeviceNameSize];
70 mutable snd_mixer_t* _inputMixerHandle; 70 mutable snd_mixer_t* _inputMixerHandle;
71 char _inputMixerStr[kAdmMaxDeviceNameSize]; 71 char _inputMixerStr[kAdmMaxDeviceNameSize];
72 mutable snd_mixer_elem_t* _outputMixerElement; 72 mutable snd_mixer_elem_t* _outputMixerElement;
73 mutable snd_mixer_elem_t* _inputMixerElement; 73 mutable snd_mixer_elem_t* _inputMixerElement;
74 }; 74 };
75 75
76 } 76 }
77 77
78 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_MIXER_MANAGER_ALSA_LINUX _H_ 78 #endif // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_MIXER_MANAGER_ALSA_LINUX _H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698