From b0b3776b272f58e152d8efeb25740aa06d78fca3 Mon Sep 17 00:00:00 2001 From: "sjlee@webrtc.org" Date: Wed, 17 Oct 2012 13:18:00 +0000 Subject: [PATCH] THis modification is casued by r2915. In r2915, the src/system_wrapper/interface/critical_section_wrapper.h was changed. The below two files are affected by r2915. Review URL: https://webrtc-codereview.appspot.com/878006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2939 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_device/ios/audio_device_ios.cc | 22 +++++++++---------- .../ios/audio_device_utility_ios.cc | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/modules/audio_device/ios/audio_device_ios.cc b/src/modules/audio_device/ios/audio_device_ios.cc index b73edc24cf..264556ca03 100644 --- a/src/modules/audio_device/ios/audio_device_ios.cc +++ b/src/modules/audio_device/ios/audio_device_ios.cc @@ -75,7 +75,7 @@ void AudioDeviceIPhone::AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) { WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _ptrAudioBuffer = audioBuffer; @@ -98,7 +98,7 @@ WebRtc_Word32 AudioDeviceIPhone::Init() { WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_initialized) { return 0; @@ -199,7 +199,7 @@ WebRtc_Word32 AudioDeviceIPhone::InitSpeaker() { WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, @@ -253,7 +253,7 @@ WebRtc_Word32 AudioDeviceIPhone::InitMicrophone() { WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, @@ -799,7 +799,7 @@ WebRtc_Word32 AudioDeviceIPhone::RecordingIsAvailable(bool& available) { WebRtc_Word32 AudioDeviceIPhone::InitPlayout() { WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, " Not initialized"); @@ -855,7 +855,7 @@ bool AudioDeviceIPhone::PlayoutIsInitialized() const { WebRtc_Word32 AudioDeviceIPhone::InitRecording() { WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, @@ -913,7 +913,7 @@ bool AudioDeviceIPhone::RecordingIsInitialized() const { WebRtc_Word32 AudioDeviceIPhone::StartRecording() { WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, @@ -960,7 +960,7 @@ WebRtc_Word32 AudioDeviceIPhone::StartRecording() { WebRtc_Word32 AudioDeviceIPhone::StopRecording() { WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, @@ -992,7 +992,7 @@ WebRtc_Word32 AudioDeviceIPhone::StartPlayout() { // This lock is (among other things) needed to avoid concurrency issues // with capture thread // shutting down AU Remote IO - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, @@ -1035,7 +1035,7 @@ WebRtc_Word32 AudioDeviceIPhone::StartPlayout() { WebRtc_Word32 AudioDeviceIPhone::StopPlayout() { WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, @@ -1072,7 +1072,7 @@ bool AudioDeviceIPhone::Playing() const { WebRtc_Word32 AudioDeviceIPhone::ResetAudioDevice() { WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized && !_recIsInitialized) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, diff --git a/src/modules/audio_device/ios/audio_device_utility_ios.cc b/src/modules/audio_device/ios/audio_device_utility_ios.cc index 87c7a50297..965d13ff4b 100644 --- a/src/modules/audio_device/ios/audio_device_utility_ios.cc +++ b/src/modules/audio_device/ios/audio_device_utility_ios.cc @@ -27,7 +27,7 @@ AudioDeviceUtilityIPhone::AudioDeviceUtilityIPhone(const WebRtc_Word32 id) AudioDeviceUtilityIPhone::~AudioDeviceUtilityIPhone() { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s destroyed", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); delete &_critSect; }