Remove more CriticalSectionWrappers.

webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.cc

 /*
  *  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.
  */
 
 #include <assert.h>
 
 #include "webrtc/modules/audio_device/linux/audio_mixer_manager_alsa_linux.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 extern webrtc_adm_linux_alsa::AlsaSymbolTable AlsaSymbolTable;
 
 // Accesses ALSA functions through our late-binding symbol table instead of
 // directly. This way we don't have to link to libalsa, which means our binary
 // will work on systems that don't have it.
 #define LATE(sym) \
   LATESYM_GET(webrtc_adm_linux_alsa::AlsaSymbolTable, &AlsaSymbolTable, sym)
 
 namespace webrtc
 {
 
 AudioMixerManagerLinuxALSA::AudioMixerManagerLinuxALSA(const int32_t id) :
-    _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
     _id(id),
     _outputMixerHandle(NULL),
     _inputMixerHandle(NULL),
     _outputMixerElement(NULL),
     _inputMixerElement(NULL)
 {
     WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id,
                  "%s constructed", __FUNCTION__);
 
     memset(_outputMixerStr, 0, kAdmMaxDeviceNameSize);
     memset(_inputMixerStr, 0, kAdmMaxDeviceNameSize);
 }
 
 AudioMixerManagerLinuxALSA::~AudioMixerManagerLinuxALSA()
 {
     WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id,
                  "%s destructed", __FUNCTION__);
-
     Close();
-
-    delete &_critSect;
 }
 
 // ============================================================================
 //                                    PUBLIC METHODS
 // ============================================================================
 
 int32_t AudioMixerManagerLinuxALSA::Close()
 {
     WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s",
                  __FUNCTION__);
 
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     CloseSpeaker();
     CloseMicrophone();
 
     return 0;
 
 }
 
 int32_t AudioMixerManagerLinuxALSA::CloseSpeaker()
 {
     WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s",
                  __FUNCTION__);
 
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     int errVal = 0;
 
     if (_outputMixerHandle != NULL)
     {
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                      "Closing playout mixer");
         LATE(snd_mixer_free)(_outputMixerHandle);
         if (errVal < 0)
         {
@@ skipping 20 matching lines @@
     }
     memset(_outputMixerStr, 0, kAdmMaxDeviceNameSize);
 
     return 0;
 }
 
 int32_t AudioMixerManagerLinuxALSA::CloseMicrophone()
 {
     WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__);
 
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     int errVal = 0;
 
     if (_inputMixerHandle != NULL)
     {
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                      "Closing record mixer");
 
         LATE(snd_mixer_free)(_inputMixerHandle);
         if (errVal < 0)
@@ skipping 31 matching lines @@
     memset(_inputMixerStr, 0, kAdmMaxDeviceNameSize);
 
     return 0;
 }
 
 int32_t AudioMixerManagerLinuxALSA::OpenSpeaker(char* deviceName)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                  "AudioMixerManagerLinuxALSA::OpenSpeaker(name=%s)", deviceName);
 
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     int errVal = 0;
 
     // Close any existing output mixer handle
     //
     if (_outputMixerHandle != NULL)
     {
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                      "Closing playout mixer");
 
@@ skipping 73 matching lines @@
 
     return 0;
 }
 
 int32_t AudioMixerManagerLinuxALSA::OpenMicrophone(char *deviceName)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                  "AudioMixerManagerLinuxALSA::OpenMicrophone(name=%s)",
                  deviceName);
 
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     int errVal = 0;
 
     // Close any existing input mixer handle
     //
     if (_inputMixerHandle != NULL)
     {
         WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                      "Closing record mixer");
 
@@ skipping 98 matching lines @@
     return (_inputMixerHandle != NULL);
 }
 
 int32_t AudioMixerManagerLinuxALSA::SetSpeakerVolume(
     uint32_t volume)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                  "AudioMixerManagerLinuxALSA::SetSpeakerVolume(volume=%u)",
                  volume);
 
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     if (_outputMixerElement == NULL)
     {
         WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id,
                      "  no avaliable output mixer element exists");
         return -1;
     }
 
     int errVal =
         LATE(snd_mixer_selem_set_playback_volume_all)(_outputMixerElement,
@@ skipping 243 matching lines @@
 
     return 0;
 }
 
 int32_t AudioMixerManagerLinuxALSA::SetSpeakerMute(bool enable)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                  "AudioMixerManagerLinuxALSA::SetSpeakerMute(enable=%u)",
                  enable);
 
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     if (_outputMixerElement == NULL)
     {
         WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id,
                      "  no avaliable output mixer element exists");
         return -1;
     }
 
     // Ensure that the selected speaker destination has a valid mute control.
     bool available(false);
@@ skipping 76 matching lines @@
     available = LATE(snd_mixer_selem_has_capture_switch)(_inputMixerElement);
     return 0;
 }
 
 int32_t AudioMixerManagerLinuxALSA::SetMicrophoneMute(bool enable)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                  "AudioMixerManagerLinuxALSA::SetMicrophoneMute(enable=%u)",
                  enable);
 
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     if (_inputMixerElement == NULL)
     {
         WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id,
                      "  no avaliable input mixer element exists");
         return -1;
     }
 
     // Ensure that the selected microphone destination has a valid mute control.
     bool available(false);
@@ skipping 78 matching lines @@
 
     return 0;
 }
 
 int32_t AudioMixerManagerLinuxALSA::SetMicrophoneBoost(bool enable)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                  "AudioMixerManagerLinuxALSA::SetMicrophoneBoost(enable=%u)",
                  enable);
 
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     if (_inputMixerHandle == NULL)
     {
         WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id,
                      "  no avaliable input mixer exists");
         return -1;
     }
 
     // Ensure that the selected microphone destination has a valid mute control.
     bool available(false);
@@ skipping 41 matching lines @@
     return 0;
 }
 
 int32_t AudioMixerManagerLinuxALSA::SetMicrophoneVolume(
     uint32_t volume)
 {
     WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                  "AudioMixerManagerLinuxALSA::SetMicrophoneVolume(volume=%u)",
                  volume);
 
-    CriticalSectionScoped lock(&_critSect);
+    rtc::CritScope lock(&_critSect);
 
     if (_inputMixerElement == NULL)
     {
         WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id,
                      "  no avaliable input mixer element exists");
         return -1;
     }
 
     int
         errVal =
@@ skipping 375 matching lines @@
 }
 
 void AudioMixerManagerLinuxALSA::GetControlName(char* controlName,
                                                 char* deviceName) const
 {
     // Example
     // deviceName: "front:CARD=Intel,DEV=0"
     // controlName: "hw:CARD=Intel"
     char* pos1 = strchr(deviceName, ':');
     char* pos2 = strchr(deviceName, ',');
-    if (!pos2)
-    {
+    if (!pos2) {
         // Can also be default:CARD=Intel
         pos2 = &deviceName[strlen(deviceName)];
     }
-    if (pos1 && pos2)
-    {
+    if (pos1 && pos2) {
         strcpy(controlName, "hw");
         int nChar = (int) (pos2 - pos1);
         strncpy(&controlName[2], pos1, nChar);
         controlName[2 + nChar] = '\0';
-    } else
-    {
+    } else {
         strcpy(controlName, deviceName);
     }
 
 }
 
 }