Remove more CriticalSectionWrappers.

webrtc/modules/audio_device/audio_device_impl.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.
  */
 
@@ skipping 35 matching lines @@
 #elif defined(WEBRTC_MAC)
 #include "audio_device_mac.h"
 #endif
 
 #if defined(WEBRTC_DUMMY_FILE_DEVICES)
 #include "webrtc/modules/audio_device/dummy/file_audio_device_factory.h"
 #endif
 
 #include "webrtc/modules/audio_device/dummy/audio_device_dummy.h"
 #include "webrtc/modules/audio_device/dummy/file_audio_device.h"
-#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 
 #define CHECK_INITIALIZED() \
   {                         \
     if (!_initialized) {    \
       return -1;            \
     };                      \
   }
 
 #define CHECK_INITIALIZED_BOOL() \
   {                              \
@@ skipping 44 matching lines @@
 // ============================================================================
 //                            Construction & Destruction
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 //  AudioDeviceModuleImpl - ctor
 // ----------------------------------------------------------------------------
 
 AudioDeviceModuleImpl::AudioDeviceModuleImpl(const int32_t id,
                                              const AudioLayer audioLayer)
-    : _critSect(*CriticalSectionWrapper::CreateCriticalSection()),
-      _critSectEventCb(*CriticalSectionWrapper::CreateCriticalSection()),
-      _critSectAudioCb(*CriticalSectionWrapper::CreateCriticalSection()),
-      _ptrCbAudioDeviceObserver(NULL),
+    : _ptrCbAudioDeviceObserver(NULL),
       _ptrAudioDevice(NULL),
       _id(id),
       _platformAudioLayer(audioLayer),
       _lastProcessTime(rtc::TimeMillis()),
       _platformType(kPlatformNotSupported),
       _initialized(false),
       _lastError(kAdmErrNone) {
   LOG(INFO) << __FUNCTION__;
 }
 
@@ skipping 216 matching lines @@
   _ptrAudioDevice->AttachAudioBuffer(&_audioDeviceBuffer);
   return 0;
 }
 
 // ----------------------------------------------------------------------------
 //  ~AudioDeviceModuleImpl - dtor
 // ----------------------------------------------------------------------------
 
 AudioDeviceModuleImpl::~AudioDeviceModuleImpl() {
   LOG(INFO) << __FUNCTION__;
-
   if (_ptrAudioDevice) {
     delete _ptrAudioDevice;
     _ptrAudioDevice = NULL;
   }
-
-  delete &_critSect;
-  delete &_critSectEventCb;
-  delete &_critSectAudioCb;
 }
 
 // ============================================================================
 //                                  Module
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 //  Module::TimeUntilNextProcess
 //
 //  Returns the number of milliseconds until the module want a worker thread
@@ skipping 11 matching lines @@
 //
 //  Check for posted error and warning reports. Generate callbacks if
 //  new reports exists.
 // ----------------------------------------------------------------------------
 
 void AudioDeviceModuleImpl::Process() {
   _lastProcessTime = rtc::TimeMillis();
 
   // kPlayoutWarning
   if (_ptrAudioDevice->PlayoutWarning()) {
-    CriticalSectionScoped lock(&_critSectEventCb);
+    rtc::CritScope lock(&_critSectEventCb);
     if (_ptrCbAudioDeviceObserver) {
       LOG(WARNING) << "=> OnWarningIsReported(kPlayoutWarning)";
       _ptrCbAudioDeviceObserver->OnWarningIsReported(
           AudioDeviceObserver::kPlayoutWarning);
     }
     _ptrAudioDevice->ClearPlayoutWarning();
   }
 
   // kPlayoutError
   if (_ptrAudioDevice->PlayoutError()) {
-    CriticalSectionScoped lock(&_critSectEventCb);
+    rtc::CritScope lock(&_critSectEventCb);
     if (_ptrCbAudioDeviceObserver) {
       LOG(LERROR) << "=> OnErrorIsReported(kPlayoutError)";
       _ptrCbAudioDeviceObserver->OnErrorIsReported(
           AudioDeviceObserver::kPlayoutError);
     }
     _ptrAudioDevice->ClearPlayoutError();
   }
 
   // kRecordingWarning
   if (_ptrAudioDevice->RecordingWarning()) {
-    CriticalSectionScoped lock(&_critSectEventCb);
+    rtc::CritScope lock(&_critSectEventCb);
     if (_ptrCbAudioDeviceObserver) {
       LOG(WARNING) << "=> OnWarningIsReported(kRecordingWarning)";
       _ptrCbAudioDeviceObserver->OnWarningIsReported(
           AudioDeviceObserver::kRecordingWarning);
     }
     _ptrAudioDevice->ClearRecordingWarning();
   }
 
   // kRecordingError
   if (_ptrAudioDevice->RecordingError()) {
-    CriticalSectionScoped lock(&_critSectEventCb);
+    rtc::CritScope lock(&_critSectEventCb);
     if (_ptrCbAudioDeviceObserver) {
       LOG(LERROR) << "=> OnErrorIsReported(kRecordingError)";
       _ptrCbAudioDeviceObserver->OnErrorIsReported(
           AudioDeviceObserver::kRecordingError);
     }
     _ptrAudioDevice->ClearRecordingError();
   }
 }
 
 // ============================================================================
@@ skipping 1007 matching lines @@
   return (_ptrAudioDevice->Recording());
 }
 
 // ----------------------------------------------------------------------------
 //  RegisterEventObserver
 // ----------------------------------------------------------------------------
 
 int32_t AudioDeviceModuleImpl::RegisterEventObserver(
     AudioDeviceObserver* eventCallback) {
   LOG(INFO) << __FUNCTION__;
-  CriticalSectionScoped lock(&_critSectEventCb);
+  rtc::CritScope lock(&_critSectEventCb);
   _ptrCbAudioDeviceObserver = eventCallback;
 
   return 0;
 }
 
 // ----------------------------------------------------------------------------
 //  RegisterAudioCallback
 // ----------------------------------------------------------------------------
 
 int32_t AudioDeviceModuleImpl::RegisterAudioCallback(
     AudioTransport* audioCallback) {
   LOG(INFO) << __FUNCTION__;
-  CriticalSectionScoped lock(&_critSectAudioCb);
+  rtc::CritScope lock(&_critSectAudioCb);
   return _audioDeviceBuffer.RegisterAudioCallback(audioCallback);
 }
 
 // ----------------------------------------------------------------------------
 //  StartRawInputFileRecording
 // ----------------------------------------------------------------------------
 
 int32_t AudioDeviceModuleImpl::StartRawInputFileRecording(
     const char pcmFileNameUTF8[kAdmMaxFileNameSize]) {
   LOG(INFO) << __FUNCTION__;
@@ skipping 362 matching lines @@
 //  PlatformAudioLayer
 // ----------------------------------------------------------------------------
 
 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer()
     const {
   LOG(INFO) << __FUNCTION__;
   return _platformAudioLayer;
 }
 
 }  // namespace webrtc