| Index: webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
|
| diff --git a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
|
| index b8be8c1b708907c91353b2dc2ec0bf631b87b20c..0ad11c8b6de7c5fcae29147ed36bbb07a0221019 100644
|
| --- a/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
|
| +++ b/webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h
|
| @@ -11,9 +11,9 @@
|
| #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H
|
| #define WEBRTC_AUDIO_DEVICE_AUDIO_MIXER_MANAGER_ALSA_LINUX_H
|
|
|
| +#include "webrtc/base/criticalsection.h"
|
| #include "webrtc/modules/audio_device/include/audio_device.h"
|
| #include "webrtc/modules/audio_device/linux/alsasymboltable_linux.h"
|
| -#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
|
| #include "webrtc/typedefs.h"
|
|
|
| #include <alsa/asoundlib.h>
|
| @@ -63,7 +63,7 @@ private:
|
| void GetControlName(char *controlName, char* deviceName) const;
|
|
|
| private:
|
| - CriticalSectionWrapper& _critSect;
|
| + rtc::CriticalSection _critSect;
|
| int32_t _id;
|
| mutable snd_mixer_t* _outputMixerHandle;
|
| char _outputMixerStr[kAdmMaxDeviceNameSize];
|
|
|