Remove ALL usage of CriticalSectionWrapper.

webrtc/modules/audio_device/mac/audio_mixer_manager_mac.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 "webrtc/modules/audio_device/mac/audio_mixer_manager_mac.h"
-#include "webrtc/system_wrappers/include/trace.h"
 
 #include <unistd.h>  // getpid()
 
 namespace webrtc {
 
 #define WEBRTC_CA_RETURN_ON_ERR(expr)                                  \
   do {                                                                 \
     err = expr;                                                        \
     if (err != noErr) {                                                \
       logCAMsg(kTraceError, kTraceAudioDevice, _id, "Error in " #expr, \
@@ skipping 14 matching lines @@
 #define WEBRTC_CA_LOG_WARN(expr)                                         \
   do {                                                                   \
     err = expr;                                                          \
     if (err != noErr) {                                                  \
       logCAMsg(kTraceWarning, kTraceAudioDevice, _id, "Error in " #expr, \
                (const char*) & err);                                     \
     }                                                                    \
   } while (0)
 
 AudioMixerManagerMac::AudioMixerManagerMac(const int32_t id)
-    : _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
-      _id(id),
+    : _id(id),
       _inputDeviceID(kAudioObjectUnknown),
       _outputDeviceID(kAudioObjectUnknown),
       _noInputChannels(0),
       _noOutputChannels(0) {
   WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s constructed",
                __FUNCTION__);
 }
 
 AudioMixerManagerMac::~AudioMixerManagerMac() {
   WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s destructed",
                __FUNCTION__);
-
   Close();
-
-  delete &_critSect;
 }
 
 // ============================================================================
 //                                      PUBLIC METHODS
 // ============================================================================
 
 int32_t AudioMixerManagerMac::Close() {
   WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__);
 
-  CriticalSectionScoped lock(&_critSect);
+  rtc::CritScope lock(&_critSect);
 
   CloseSpeaker();
   CloseMicrophone();
 
   return 0;
 }
 
 int32_t AudioMixerManagerMac::CloseSpeaker() {
   WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__);
 
-  CriticalSectionScoped lock(&_critSect);
+  rtc::CritScope lock(&_critSect);
 
   _outputDeviceID = kAudioObjectUnknown;
   _noOutputChannels = 0;
 
   return 0;
 }
 
 int32_t AudioMixerManagerMac::CloseMicrophone() {
   WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__);
 
-  CriticalSectionScoped lock(&_critSect);
+  rtc::CritScope lock(&_critSect);
 
   _inputDeviceID = kAudioObjectUnknown;
   _noInputChannels = 0;
 
   return 0;
 }
 
 int32_t AudioMixerManagerMac::OpenSpeaker(AudioDeviceID deviceID) {
   WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                "AudioMixerManagerMac::OpenSpeaker(id=%d)", deviceID);
 
-  CriticalSectionScoped lock(&_critSect);
+  rtc::CritScope lock(&_critSect);
 
   OSStatus err = noErr;
   UInt32 size = 0;
   pid_t hogPid = -1;
 
   _outputDeviceID = deviceID;
 
   // Check which process, if any, has hogged the device.
   AudioObjectPropertyAddress propertyAddress = {
       kAudioDevicePropertyHogMode, kAudioDevicePropertyScopeOutput, 0};
@@ skipping 30 matching lines @@
 
   _noOutputChannels = streamFormat.mChannelsPerFrame;
 
   return 0;
 }
 
 int32_t AudioMixerManagerMac::OpenMicrophone(AudioDeviceID deviceID) {
   WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                "AudioMixerManagerMac::OpenMicrophone(id=%d)", deviceID);
 
-  CriticalSectionScoped lock(&_critSect);
+  rtc::CritScope lock(&_critSect);
 
   OSStatus err = noErr;
   UInt32 size = 0;
   pid_t hogPid = -1;
 
   _inputDeviceID = deviceID;
 
   // Check which process, if any, has hogged the device.
   AudioObjectPropertyAddress propertyAddress = {
       kAudioDevicePropertyHogMode, kAudioDevicePropertyScopeInput, 0};
@@ skipping 40 matching lines @@
 bool AudioMixerManagerMac::MicrophoneIsInitialized() const {
   WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s", __FUNCTION__);
 
   return (_inputDeviceID != kAudioObjectUnknown);
 }
 
 int32_t AudioMixerManagerMac::SetSpeakerVolume(uint32_t volume) {
   WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                "AudioMixerManagerMac::SetSpeakerVolume(volume=%u)", volume);
 
-  CriticalSectionScoped lock(&_critSect);
+  rtc::CritScope lock(&_critSect);
 
   if (_outputDeviceID == kAudioObjectUnknown) {
     WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id,
                  "  device ID has not been set");
     return -1;
   }
 
   OSStatus err = noErr;
   UInt32 size = 0;
   bool success = false;
@@ skipping 219 matching lines @@
   }
 
   available = true;
   return 0;
 }
 
 int32_t AudioMixerManagerMac::SetSpeakerMute(bool enable) {
   WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                "AudioMixerManagerMac::SetSpeakerMute(enable=%u)", enable);
 
-  CriticalSectionScoped lock(&_critSect);
+  rtc::CritScope lock(&_critSect);
 
   if (_outputDeviceID == kAudioObjectUnknown) {
     WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id,
                  "  device ID has not been set");
     return -1;
   }
 
   OSStatus err = noErr;
   UInt32 size = 0;
   UInt32 mute = enable ? 1 : 0;
@@ skipping 155 matching lines @@
   }
 
   available = true;
   return 0;
 }
 
 int32_t AudioMixerManagerMac::SetMicrophoneMute(bool enable) {
   WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                "AudioMixerManagerMac::SetMicrophoneMute(enable=%u)", enable);
 
-  CriticalSectionScoped lock(&_critSect);
+  rtc::CritScope lock(&_critSect);
 
   if (_inputDeviceID == kAudioObjectUnknown) {
     WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id,
                  "  device ID has not been set");
     return -1;
   }
 
   OSStatus err = noErr;
   UInt32 size = 0;
   UInt32 mute = enable ? 1 : 0;
@@ skipping 106 matching lines @@
 
   available = false;  // No AudioObjectPropertySelector value for Mic Boost
 
   return 0;
 }
 
 int32_t AudioMixerManagerMac::SetMicrophoneBoost(bool enable) {
   WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                "AudioMixerManagerMac::SetMicrophoneBoost(enable=%u)", enable);
 
-  CriticalSectionScoped lock(&_critSect);
+  rtc::CritScope lock(&_critSect);
 
   if (_inputDeviceID == kAudioObjectUnknown) {
     WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id,
                  "  device ID has not been set");
     return -1;
   }
 
   // Ensure that the selected microphone has a valid boost control.
   bool available(false);
   MicrophoneBoostIsAvailable(available);
@@ skipping 57 matching lines @@
   }
 
   available = true;
   return 0;
 }
 
 int32_t AudioMixerManagerMac::SetMicrophoneVolume(uint32_t volume) {
   WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id,
                "AudioMixerManagerMac::SetMicrophoneVolume(volume=%u)", volume);
 
-  CriticalSectionScoped lock(&_critSect);
+  rtc::CritScope lock(&_critSect);
 
   if (_inputDeviceID == kAudioObjectUnknown) {
     WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id,
                  "  device ID has not been set");
     return -1;
   }
 
   OSStatus err = noErr;
   UInt32 size = 0;
   bool success = false;
@@ skipping 162 matching lines @@
   WEBRTC_TRACE(level, module, id, "%s: %.4s", msg, err);
 #else
   // We need to flip the characters in this case.
   WEBRTC_TRACE(level, module, id, "%s: %.1s%.1s%.1s%.1s", msg, err + 3, err + 2,
                err + 1, err);
 #endif
 }
 
 }  // namespace webrtc
 // EOF