Remove more CriticalSectionWrappers.

webrtc/modules/audio_device/linux/audio_device_alsa_linux.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_ALSA_LINUX_H
 
 #include <memory>
 
+#include "webrtc/base/criticalsection.h"
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/modules/audio_device/audio_device_generic.h"
 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 #include <alsa/asoundlib.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 
 
 namespace webrtc
@@ skipping 108 matching lines @@
     int32_t SetPlayoutBuffer(const AudioDeviceModule::BufferType type,
                              uint16_t sizeMS) override;
     int32_t PlayoutBuffer(AudioDeviceModule::BufferType& type,
                           uint16_t& sizeMS) const override;
     int32_t PlayoutDelay(uint16_t& delayMS) const override;
     int32_t RecordingDelay(uint16_t& delayMS) const override;
 
     // CPU load
     int32_t CPULoad(uint16_t& load) const override;
 
-public:
  bool PlayoutWarning() const override;
  bool PlayoutError() const override;
  bool RecordingWarning() const override;
  bool RecordingError() const override;
  void ClearPlayoutWarning() override;
  void ClearPlayoutError() override;
  void ClearRecordingWarning() override;
  void ClearRecordingError() override;
 
-public:
  void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override;
 
 private:
     int32_t GetDevicesInfo(const int32_t function,
                            const bool playback,
                            const int32_t enumDeviceNo = 0,
                            char* enumDeviceName = NULL,
                            const int32_t ednLen = 0) const;
     int32_t ErrorRecovery(int32_t error, snd_pcm_t* deviceHandle);
 
-private:
     bool KeyPressed() const;
 
-private:
     void Lock() EXCLUSIVE_LOCK_FUNCTION(_critSect) { _critSect.Enter(); };
     void UnLock() UNLOCK_FUNCTION(_critSect) { _critSect.Leave(); };
-private:
+
     inline int32_t InputSanityCheckAfterUnlockedPeriod() const;
     inline int32_t OutputSanityCheckAfterUnlockedPeriod() const;
 
-private:
     static bool RecThreadFunc(void*);
     static bool PlayThreadFunc(void*);
     bool RecThreadProcess();
     bool PlayThreadProcess();
 
-private:
     AudioDeviceBuffer* _ptrAudioBuffer;
 
-    CriticalSectionWrapper& _critSect;
+    rtc::CriticalSection _critSect;
 
     // TODO(pbos): Make plain members and start/stop instead of resetting these
     // pointers. A thread can be reused.
     std::unique_ptr<rtc::PlatformThread> _ptrThreadRec;
     std::unique_ptr<rtc::PlatformThread> _ptrThreadPlay;
 
     int32_t _id;
 
     AudioMixerManagerLinuxALSA _mixerManager;
 
@@ skipping 20 matching lines @@
     uint8_t _recChannels;
     uint8_t _playChannels;
 
     int8_t* _recordingBuffer; // in byte
     int8_t* _playoutBuffer; // in byte
     uint32_t _recordingFramesLeft;
     uint32_t _playoutFramesLeft;
 
     AudioDeviceModule::BufferType _playBufType;
 
-private:
     bool _initialized;
     bool _recording;
     bool _playing;
     bool _recIsInitialized;
     bool _playIsInitialized;
     bool _AGC;
 
     snd_pcm_sframes_t _recordingDelay;
     snd_pcm_sframes_t _playoutDelay;
 
     uint16_t _playWarning;
     uint16_t _playError;
     uint16_t _recWarning;
     uint16_t _recError;
 
     uint16_t _playBufDelay;                 // playback delay
     uint16_t _playBufDelayFixed;            // fixed playback delay
 
     char _oldKeyState[32];
 #if defined(USE_X11)
     Display* _XDisplay;
 #endif
 };
 
 }
 
 #endif  // MODULES_AUDIO_DEVICE_MAIN_SOURCE_LINUX_AUDIO_DEVICE_ALSA_LINUX_H_