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/src@2939 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/modules/audio_device/ios/audio_device_ios.cc b/modules/audio_device/ios/audio_device_ios.cc
index b73edc2..264556c 100644
--- a/modules/audio_device/ios/audio_device_ios.cc
+++ b/modules/audio_device/ios/audio_device_ios.cc
@@ -75,7 +75,7 @@
WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id,
"%s", __FUNCTION__);
- CriticalSectionScoped lock(_critSect);
+ CriticalSectionScoped lock(&_critSect);
_ptrAudioBuffer = audioBuffer;
@@ -98,7 +98,7 @@
WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id,
"%s", __FUNCTION__);
- CriticalSectionScoped lock(_critSect);
+ CriticalSectionScoped lock(&_critSect);
if (_initialized) {
return 0;
@@ -199,7 +199,7 @@
WEBRTC_TRACE(kTraceModuleCall, kTraceAudioDevice, _id,
"%s", __FUNCTION__);
- CriticalSectionScoped lock(_critSect);
+ CriticalSectionScoped lock(&_critSect);
if (!_initialized) {
WEBRTC_TRACE(kTraceError, kTraceAudioDevice,
@@ -253,7 +253,7 @@
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::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 @@
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 @@
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::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 @@
// 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::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 @@
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/modules/audio_device/ios/audio_device_utility_ios.cc b/modules/audio_device/ios/audio_device_utility_ios.cc
index 87c7a50..965d13f 100644
--- a/modules/audio_device/ios/audio_device_utility_ios.cc
+++ b/modules/audio_device/ios/audio_device_utility_ios.cc
@@ -27,7 +27,7 @@
AudioDeviceUtilityIPhone::~AudioDeviceUtilityIPhone() {
WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id,
"%s destroyed", __FUNCTION__);
- CriticalSectionScoped lock(_critSect);
+ CriticalSectionScoped lock(&_critSect);
delete &_critSect;
}