From a014ecc04906ac57fb1d907496b85880d2a36f68 Mon Sep 17 00:00:00 2001 From: "mflodman@webrtc.org" Date: Thu, 12 Apr 2012 12:15:51 +0000 Subject: [PATCH] Changed CriticalSectionScoped constructor usage for ADM. Only search and replace for the input to the constructor, no other changes. BUG=184 TEST=Compiles on all platforms. Review URL: https://webrtc-codereview.appspot.com/483001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2015 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../android/audio_device_android_jni.cc | 22 +++--- .../android/audio_device_android_opensles.cc | 22 +++--- .../android/audio_device_utility_android.cc | 2 +- .../main/source/audio_device_buffer.cc | 40 +++++----- .../main/source/audio_device_impl.cc | 12 +-- .../main/source/dummy/audio_device_dummy.cc | 50 ++++++------- .../dummy/audio_device_utility_dummy.cc | 2 +- .../source/linux/audio_device_alsa_linux.cc | 26 +++---- .../source/linux/audio_device_pulse_linux.cc | 32 ++++---- .../linux/audio_device_utility_linux.cc | 2 +- .../linux/audio_mixer_manager_alsa_linux.cc | 20 ++--- .../linux/audio_mixer_manager_pulse_linux.cc | 26 +++---- .../main/source/mac/audio_device_mac.cc | 26 +++---- .../source/mac/audio_device_utility_mac.cc | 2 +- .../source/mac/audio_mixer_manager_mac.cc | 20 ++--- .../main/source/win/audio_device_core_win.cc | 74 +++++++++---------- .../source/win/audio_device_utility_win.cc | 2 +- .../main/source/win/audio_device_wave_win.cc | 32 ++++---- .../source/win/audio_mixer_manager_win.cc | 26 +++---- 19 files changed, 219 insertions(+), 219 deletions(-) diff --git a/src/modules/audio_device/main/source/android/audio_device_android_jni.cc b/src/modules/audio_device/main/source/android/audio_device_android_jni.cc index c275171baf..c6357f00df 100644 --- a/src/modules/audio_device/main/source/android/audio_device_android_jni.cc +++ b/src/modules/audio_device/main/source/android/audio_device_android_jni.cc @@ -191,7 +191,7 @@ AudioDeviceAndroidJni::~AudioDeviceAndroidJni() void AudioDeviceAndroidJni::AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _ptrAudioBuffer = audioBuffer; @@ -222,7 +222,7 @@ WebRtc_Word32 AudioDeviceAndroidJni::ActiveAudioLayer( WebRtc_Word32 AudioDeviceAndroidJni::Init() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_initialized) { @@ -309,7 +309,7 @@ WebRtc_Word32 AudioDeviceAndroidJni::Init() WebRtc_Word32 AudioDeviceAndroidJni::Terminate() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { @@ -493,7 +493,7 @@ WebRtc_Word32 AudioDeviceAndroidJni::SpeakerIsAvailable(bool& available) WebRtc_Word32 AudioDeviceAndroidJni::InitSpeaker() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -536,7 +536,7 @@ WebRtc_Word32 AudioDeviceAndroidJni::MicrophoneIsAvailable(bool& available) WebRtc_Word32 AudioDeviceAndroidJni::InitMicrophone() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -1328,7 +1328,7 @@ WebRtc_Word32 AudioDeviceAndroidJni::RecordingIsAvailable(bool& available) WebRtc_Word32 AudioDeviceAndroidJni::InitPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { @@ -1436,7 +1436,7 @@ WebRtc_Word32 AudioDeviceAndroidJni::InitPlayout() WebRtc_Word32 AudioDeviceAndroidJni::InitRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { @@ -1544,7 +1544,7 @@ WebRtc_Word32 AudioDeviceAndroidJni::InitRecording() WebRtc_Word32 AudioDeviceAndroidJni::StartRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { @@ -1629,7 +1629,7 @@ WebRtc_Word32 AudioDeviceAndroidJni::StopRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { @@ -1728,7 +1728,7 @@ bool AudioDeviceAndroidJni::PlayoutIsInitialized() const WebRtc_Word32 AudioDeviceAndroidJni::StartPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { @@ -1812,7 +1812,7 @@ WebRtc_Word32 AudioDeviceAndroidJni::StartPlayout() WebRtc_Word32 AudioDeviceAndroidJni::StopPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { diff --git a/src/modules/audio_device/main/source/android/audio_device_android_opensles.cc b/src/modules/audio_device/main/source/android/audio_device_android_opensles.cc index 2dd4a4c805..b3296a2f26 100644 --- a/src/modules/audio_device/main/source/android/audio_device_android_opensles.cc +++ b/src/modules/audio_device/main/source/android/audio_device_android_opensles.cc @@ -106,7 +106,7 @@ AudioDeviceAndroidOpenSLES::~AudioDeviceAndroidOpenSLES() { void AudioDeviceAndroidOpenSLES::AttachAudioBuffer( AudioDeviceBuffer* audioBuffer) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _ptrAudioBuffer = audioBuffer; @@ -127,7 +127,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::ActiveAudioLayer( WebRtc_Word32 AudioDeviceAndroidOpenSLES::Init() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_initialized) { return 0; @@ -193,7 +193,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::Init() { WebRtc_Word32 AudioDeviceAndroidOpenSLES::Terminate() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { return 0; @@ -234,7 +234,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::SpeakerIsAvailable(bool& available) { WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitSpeaker() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, @@ -265,7 +265,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::MicrophoneIsAvailable(bool& available) WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitMicrophone() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, @@ -928,7 +928,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::RecordingIsAvailable(bool& available) WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, " Not initialized"); @@ -1085,7 +1085,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitPlayout() { WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, " Not initialized"); @@ -1285,7 +1285,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::InitRecording() { WebRtc_Word32 AudioDeviceAndroidOpenSLES::StartRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, @@ -1375,7 +1375,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::StartRecording() { WebRtc_Word32 AudioDeviceAndroidOpenSLES::StopRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, @@ -1450,7 +1450,7 @@ bool AudioDeviceAndroidOpenSLES::PlayoutIsInitialized() const { WebRtc_Word32 AudioDeviceAndroidOpenSLES::StartPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, @@ -1532,7 +1532,7 @@ WebRtc_Word32 AudioDeviceAndroidOpenSLES::StartPlayout() { WebRtc_Word32 AudioDeviceAndroidOpenSLES::StopPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, diff --git a/src/modules/audio_device/main/source/android/audio_device_utility_android.cc b/src/modules/audio_device/main/source/android/audio_device_utility_android.cc index 84b4c60d96..ccb15d335f 100644 --- a/src/modules/audio_device/main/source/android/audio_device_utility_android.cc +++ b/src/modules/audio_device/main/source/android/audio_device_utility_android.cc @@ -33,7 +33,7 @@ AudioDeviceUtilityAndroid::~AudioDeviceUtilityAndroid() WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s destroyed", __FUNCTION__); { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); } delete &_critSect; diff --git a/src/modules/audio_device/main/source/audio_device_buffer.cc b/src/modules/audio_device/main/source/audio_device_buffer.cc index 25c5b8415f..83bb450489 100644 --- a/src/modules/audio_device/main/source/audio_device_buffer.cc +++ b/src/modules/audio_device/main/source/audio_device_buffer.cc @@ -67,7 +67,7 @@ AudioDeviceBuffer::~AudioDeviceBuffer() { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s destroyed", __FUNCTION__); { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _recFile.Flush(); _recFile.CloseFile(); @@ -100,7 +100,7 @@ void AudioDeviceBuffer::SetId(WebRtc_UWord32 id) WebRtc_Word32 AudioDeviceBuffer::RegisterAudioCallback(AudioTransport* audioCallback) { - CriticalSectionScoped lock(_critSectCb); + CriticalSectionScoped lock(&_critSectCb); _ptrCbAudioTransport = audioCallback; return 0; @@ -114,7 +114,7 @@ WebRtc_Word32 AudioDeviceBuffer::InitPlayout() { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_measureDelay) { @@ -133,7 +133,7 @@ WebRtc_Word32 AudioDeviceBuffer::InitRecording() { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_measureDelay) { @@ -152,7 +152,7 @@ WebRtc_Word32 AudioDeviceBuffer::SetRecordingSampleRate(WebRtc_UWord32 fsHz) { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "AudioDeviceBuffer::SetRecordingSampleRate(fsHz=%u)", fsHz); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _recSampleRate = fsHz; return 0; } @@ -165,7 +165,7 @@ WebRtc_Word32 AudioDeviceBuffer::SetPlayoutSampleRate(WebRtc_UWord32 fsHz) { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "AudioDeviceBuffer::SetPlayoutSampleRate(fsHz=%u)", fsHz); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _playSampleRate = fsHz; return 0; } @@ -196,7 +196,7 @@ WebRtc_Word32 AudioDeviceBuffer::SetRecordingChannels(WebRtc_UWord8 channels) { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "AudioDeviceBuffer::SetRecordingChannels(channels=%u)", channels); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _recChannels = channels; _recBytesPerSample = 2*channels; // 16 bits per sample in mono, 32 bits in stereo return 0; @@ -210,7 +210,7 @@ WebRtc_Word32 AudioDeviceBuffer::SetPlayoutChannels(WebRtc_UWord8 channels) { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "AudioDeviceBuffer::SetPlayoutChannels(channels=%u)", channels); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _playChannels = channels; // 16 bits per sample in mono, 32 bits in stereo _playBytesPerSample = 2*channels; @@ -230,7 +230,7 @@ WebRtc_Word32 AudioDeviceBuffer::SetPlayoutChannels(WebRtc_UWord8 channels) WebRtc_Word32 AudioDeviceBuffer::SetRecordingChannel(const AudioDeviceModule::ChannelType channel) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recChannels == 1) { @@ -326,7 +326,7 @@ WebRtc_Word32 AudioDeviceBuffer::StartInputFileRecording( { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _recFile.Flush(); _recFile.CloseFile(); @@ -342,7 +342,7 @@ WebRtc_Word32 AudioDeviceBuffer::StopInputFileRecording() { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _recFile.Flush(); _recFile.CloseFile(); @@ -359,7 +359,7 @@ WebRtc_Word32 AudioDeviceBuffer::StartOutputFileRecording( { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _playFile.Flush(); _playFile.CloseFile(); @@ -375,7 +375,7 @@ WebRtc_Word32 AudioDeviceBuffer::StopOutputFileRecording() { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _playFile.Flush(); _playFile.CloseFile(); @@ -401,7 +401,7 @@ WebRtc_Word32 AudioDeviceBuffer::StopOutputFileRecording() WebRtc_Word32 AudioDeviceBuffer::SetRecordedBuffer(const void* audioBuffer, WebRtc_UWord32 nSamples) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recBytesPerSample == 0) { @@ -463,7 +463,7 @@ WebRtc_Word32 AudioDeviceBuffer::SetRecordedBuffer(const void* audioBuffer, WebRtc_Word32 AudioDeviceBuffer::DeliverRecordedData() { - CriticalSectionScoped lock(_critSectCb); + CriticalSectionScoped lock(&_critSectCb); // Ensure that user has initialized all essential members if ((_recSampleRate == 0) || @@ -487,7 +487,7 @@ WebRtc_Word32 AudioDeviceBuffer::DeliverRecordedData() if (_measureDelay) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); memset(&_recBuffer[0], 0, _recSize); WebRtc_UWord32 time = AudioDeviceUtility::GetTimeInMS(); @@ -525,7 +525,7 @@ WebRtc_Word32 AudioDeviceBuffer::DeliverRecordedData() WebRtc_Word32 AudioDeviceBuffer::RequestPlayoutData(WebRtc_UWord32 nSamples) { { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Ensure that user has initialized all essential members if ((_playBytesPerSample == 0) || @@ -553,7 +553,7 @@ WebRtc_Word32 AudioDeviceBuffer::RequestPlayoutData(WebRtc_UWord32 nSamples) WebRtc_UWord32 nSamplesOut(0); - CriticalSectionScoped lock(_critSectCb); + CriticalSectionScoped lock(&_critSectCb); if (_ptrCbAudioTransport == NULL) { @@ -581,7 +581,7 @@ WebRtc_Word32 AudioDeviceBuffer::RequestPlayoutData(WebRtc_UWord32 nSamples) if (_measureDelay) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); WebRtc_Word16 maxAbs = WebRtcSpl_MaxAbsValueW16((const WebRtc_Word16*)&_playBuffer[0], (WebRtc_Word16)nSamplesOut*_playChannels); if (maxAbs > 1000) @@ -613,7 +613,7 @@ WebRtc_Word32 AudioDeviceBuffer::RequestPlayoutData(WebRtc_UWord32 nSamples) WebRtc_Word32 AudioDeviceBuffer::GetPlayoutData(void* audioBuffer) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playSize > kMaxBufferSizeBytes) { diff --git a/src/modules/audio_device/main/source/audio_device_impl.cc b/src/modules/audio_device/main/source/audio_device_impl.cc index 6d2999af46..1d7b8247b4 100644 --- a/src/modules/audio_device/main/source/audio_device_impl.cc +++ b/src/modules/audio_device/main/source/audio_device_impl.cc @@ -491,7 +491,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Process() // kPlayoutWarning if (_ptrAudioDevice->PlayoutWarning()) { - CriticalSectionScoped lock(_critSectEventCb); + CriticalSectionScoped lock(&_critSectEventCb); if (_ptrCbAudioDeviceObserver) { WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, "=> OnWarningIsReported(kPlayoutWarning)"); @@ -503,7 +503,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Process() // kPlayoutError if (_ptrAudioDevice->PlayoutError()) { - CriticalSectionScoped lock(_critSectEventCb); + CriticalSectionScoped lock(&_critSectEventCb); if (_ptrCbAudioDeviceObserver) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "=> OnErrorIsReported(kPlayoutError)"); @@ -515,7 +515,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Process() // kRecordingWarning if (_ptrAudioDevice->RecordingWarning()) { - CriticalSectionScoped lock(_critSectEventCb); + CriticalSectionScoped lock(&_critSectEventCb); if (_ptrCbAudioDeviceObserver) { WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, "=> OnWarningIsReported(kRecordingWarning)"); @@ -527,7 +527,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::Process() // kRecordingError if (_ptrAudioDevice->RecordingError()) { - CriticalSectionScoped lock(_critSectEventCb); + CriticalSectionScoped lock(&_critSectEventCb); if (_ptrCbAudioDeviceObserver) { WEBRTC_TRACE(kTraceError, kTraceAudioDevice, _id, "=> OnErrorIsReported(kRecordingError)"); @@ -1682,7 +1682,7 @@ bool AudioDeviceModuleImpl::Recording() const WebRtc_Word32 AudioDeviceModuleImpl::RegisterEventObserver(AudioDeviceObserver* eventCallback) { - CriticalSectionScoped lock(_critSectEventCb); + CriticalSectionScoped lock(&_critSectEventCb); _ptrCbAudioDeviceObserver = eventCallback; return 0; @@ -1695,7 +1695,7 @@ WebRtc_Word32 AudioDeviceModuleImpl::RegisterEventObserver(AudioDeviceObserver* WebRtc_Word32 AudioDeviceModuleImpl::RegisterAudioCallback(AudioTransport* audioCallback) { - CriticalSectionScoped lock(_critSectAudioCb); + CriticalSectionScoped lock(&_critSectAudioCb); _audioDeviceBuffer.RegisterAudioCallback(audioCallback); return 0; diff --git a/src/modules/audio_device/main/source/dummy/audio_device_dummy.cc b/src/modules/audio_device/main/source/dummy/audio_device_dummy.cc index 6beba94305..34c67c3ae9 100644 --- a/src/modules/audio_device/main/source/dummy/audio_device_dummy.cc +++ b/src/modules/audio_device/main/source/dummy/audio_device_dummy.cc @@ -149,7 +149,7 @@ WebRtc_Word32 AudioDeviceDummy::ActiveAudioLayer( WebRtc_Word32 AudioDeviceDummy::Init() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_initialized) { @@ -249,7 +249,7 @@ WebRtc_Word32 AudioDeviceDummy::Init() WebRtc_Word32 AudioDeviceDummy::Terminate() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { @@ -327,7 +327,7 @@ bool AudioDeviceDummy::Initialized() const WebRtc_Word32 AudioDeviceDummy::SpeakerIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); available = true; @@ -341,7 +341,7 @@ WebRtc_Word32 AudioDeviceDummy::SpeakerIsAvailable(bool& available) WebRtc_Word32 AudioDeviceDummy::InitSpeaker() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -360,7 +360,7 @@ WebRtc_Word32 AudioDeviceDummy::InitSpeaker() WebRtc_Word32 AudioDeviceDummy::MicrophoneIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); available = true; @@ -374,7 +374,7 @@ WebRtc_Word32 AudioDeviceDummy::MicrophoneIsAvailable(bool& available) WebRtc_Word32 AudioDeviceDummy::InitMicrophone() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -413,7 +413,7 @@ bool AudioDeviceDummy::MicrophoneIsInitialized() const WebRtc_Word32 AudioDeviceDummy::SpeakerVolumeIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); available = false; @@ -497,7 +497,7 @@ WebRtc_Word32 AudioDeviceDummy::SpeakerVolumeStepSize(WebRtc_UWord16& stepSize) WebRtc_Word32 AudioDeviceDummy::SpeakerMuteIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); available = false; @@ -531,7 +531,7 @@ WebRtc_Word32 AudioDeviceDummy::SpeakerMute(bool& enabled) const WebRtc_Word32 AudioDeviceDummy::MicrophoneMuteIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); available = false; @@ -607,7 +607,7 @@ WebRtc_Word32 AudioDeviceDummy::StereoRecordingIsAvailable(bool& available) WebRtc_Word32 AudioDeviceDummy::SetStereoRecording(bool enable) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (enable) { @@ -647,7 +647,7 @@ WebRtc_Word32 AudioDeviceDummy::StereoPlayoutIsAvailable(bool& available) WebRtc_Word32 AudioDeviceDummy::SetStereoPlayout(bool enable) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (enable) { @@ -696,7 +696,7 @@ bool AudioDeviceDummy::AGC() const WebRtc_Word32 AudioDeviceDummy::MicrophoneVolumeIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); available = false; @@ -712,7 +712,7 @@ WebRtc_Word32 AudioDeviceDummy::SetMicrophoneVolume(WebRtc_UWord32 volume) WEBRTC_TRACE(kTraceStream, kTraceAudioDevice, _id, "AudioDeviceDummy::SetMicrophoneVolume(volume=%u)", volume); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); return -1; } @@ -725,7 +725,7 @@ WebRtc_Word32 AudioDeviceDummy::MicrophoneVolume(WebRtc_UWord32& volume) const { // WEBRTC_TRACE(kTraceStream, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); return -1; } @@ -771,7 +771,7 @@ WebRtc_Word32 AudioDeviceDummy::MicrophoneVolumeStepSize( WebRtc_Word16 AudioDeviceDummy::PlayoutDevices() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); return 1; } @@ -863,7 +863,7 @@ WebRtc_Word32 AudioDeviceDummy::RecordingDeviceName( WebRtc_Word16 AudioDeviceDummy::RecordingDevices() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); return 1; } @@ -929,7 +929,7 @@ WebRtc_Word32 AudioDeviceDummy::RecordingIsAvailable(bool& available) WebRtc_Word32 AudioDeviceDummy::InitPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -960,7 +960,7 @@ WebRtc_Word32 AudioDeviceDummy::InitPlayout() WebRtc_Word32 AudioDeviceDummy::InitRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -992,7 +992,7 @@ WebRtc_Word32 AudioDeviceDummy::InitRecording() WebRtc_Word32 AudioDeviceDummy::StartRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { @@ -1016,7 +1016,7 @@ WebRtc_Word32 AudioDeviceDummy::StartRecording() WebRtc_Word32 AudioDeviceDummy::StopRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { @@ -1064,7 +1064,7 @@ bool AudioDeviceDummy::PlayoutIsInitialized() const WebRtc_Word32 AudioDeviceDummy::StartPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { @@ -1105,7 +1105,7 @@ WebRtc_Word32 AudioDeviceDummy::StopPlayout() WebRtc_Word32 AudioDeviceDummy::PlayoutDelay(WebRtc_UWord16& delayMS) const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); delayMS = 0; return 0; } @@ -1116,7 +1116,7 @@ WebRtc_Word32 AudioDeviceDummy::PlayoutDelay(WebRtc_UWord16& delayMS) const WebRtc_Word32 AudioDeviceDummy::RecordingDelay(WebRtc_UWord16& delayMS) const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); delayMS = 0; return 0; } @@ -1137,7 +1137,7 @@ WebRtc_Word32 AudioDeviceDummy::SetPlayoutBuffer( const AudioDeviceModule::BufferType type, WebRtc_UWord16 sizeMS) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Just ignore @@ -1151,7 +1151,7 @@ WebRtc_Word32 AudioDeviceDummy::SetPlayoutBuffer( WebRtc_Word32 AudioDeviceDummy::PlayoutBuffer( AudioDeviceModule::BufferType& type, WebRtc_UWord16& sizeMS) const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); type = AudioDeviceModule::kAdaptiveBufferSize; sizeMS = 0; diff --git a/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.cc b/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.cc index 44f2c25528..4568182c93 100644 --- a/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.cc +++ b/src/modules/audio_device/main/source/dummy/audio_device_utility_dummy.cc @@ -30,7 +30,7 @@ AudioDeviceUtilityDummy::~AudioDeviceUtilityDummy() WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s destroyed", __FUNCTION__); { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // free stuff here... } diff --git a/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc b/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc index ae641f3e6a..8a7908c1dd 100644 --- a/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc +++ b/src/modules/audio_device/main/source/linux/audio_device_alsa_linux.cc @@ -143,7 +143,7 @@ AudioDeviceLinuxALSA::~AudioDeviceLinuxALSA() void AudioDeviceLinuxALSA::AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _ptrAudioBuffer = audioBuffer; @@ -166,7 +166,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::ActiveAudioLayer( WebRtc_Word32 AudioDeviceLinuxALSA::Init() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Load libasound if (!AlsaSymbolTable.Load()) @@ -201,7 +201,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::Terminate() return 0; } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _mixerManager.Close(); @@ -292,7 +292,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::SpeakerIsAvailable(bool& available) WebRtc_Word32 AudioDeviceLinuxALSA::InitSpeaker() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -335,7 +335,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::MicrophoneIsAvailable(bool& available) WebRtc_Word32 AudioDeviceLinuxALSA::InitMicrophone() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -637,7 +637,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::MicrophoneBoost(bool& enabled) const WebRtc_Word32 AudioDeviceLinuxALSA::StereoRecordingIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // If we already have initialized in stereo it's obviously available if (_recIsInitialized && (2 == _recChannels)) @@ -708,7 +708,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::StereoRecording(bool& enabled) const WebRtc_Word32 AudioDeviceLinuxALSA::StereoPlayoutIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // If we already have initialized in stereo it's obviously available if (_playIsInitialized && (2 == _playChannels)) @@ -1086,7 +1086,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::InitPlayout() int errVal = 0; - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { return -1; @@ -1239,7 +1239,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::InitRecording() int errVal = 0; - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -1497,7 +1497,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::StopRecording() { { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { @@ -1525,7 +1525,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::StopRecording() _ptrThreadRec = NULL; } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _recordingFramesLeft = 0; if (_recordingBuffer) { @@ -1655,7 +1655,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::StopPlayout() { { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { @@ -1682,7 +1682,7 @@ WebRtc_Word32 AudioDeviceLinuxALSA::StopPlayout() _ptrThreadPlay = NULL; } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _playoutFramesLeft = 0; delete [] _playoutBuffer; diff --git a/src/modules/audio_device/main/source/linux/audio_device_pulse_linux.cc b/src/modules/audio_device/main/source/linux/audio_device_pulse_linux.cc index d4fdaee118..3eebce27cc 100644 --- a/src/modules/audio_device/main/source/linux/audio_device_pulse_linux.cc +++ b/src/modules/audio_device/main/source/linux/audio_device_pulse_linux.cc @@ -175,7 +175,7 @@ AudioDeviceLinuxPulse::~AudioDeviceLinuxPulse() void AudioDeviceLinuxPulse::AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _ptrAudioBuffer = audioBuffer; @@ -202,7 +202,7 @@ WebRtc_Word32 AudioDeviceLinuxPulse::ActiveAudioLayer( WebRtc_Word32 AudioDeviceLinuxPulse::Init() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_initialized) { @@ -385,7 +385,7 @@ WebRtc_Word32 AudioDeviceLinuxPulse::SpeakerIsAvailable(bool& available) WebRtc_Word32 AudioDeviceLinuxPulse::InitSpeaker() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -458,7 +458,7 @@ WebRtc_Word32 AudioDeviceLinuxPulse::MicrophoneIsAvailable(bool& available) WebRtc_Word32 AudioDeviceLinuxPulse::InitMicrophone() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -1248,7 +1248,7 @@ WebRtc_Word32 AudioDeviceLinuxPulse::RecordingIsAvailable(bool& available) WebRtc_Word32 AudioDeviceLinuxPulse::InitPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -1374,7 +1374,7 @@ WebRtc_Word32 AudioDeviceLinuxPulse::InitPlayout() WebRtc_Word32 AudioDeviceLinuxPulse::InitRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -1531,7 +1531,7 @@ WebRtc_Word32 AudioDeviceLinuxPulse::StartRecording() WebRtc_Word32 AudioDeviceLinuxPulse::StopRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { @@ -1649,7 +1649,7 @@ WebRtc_Word32 AudioDeviceLinuxPulse::StartPlayout() WebRtc_Word32 AudioDeviceLinuxPulse::StopPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { @@ -1767,49 +1767,49 @@ WebRtc_Word32 AudioDeviceLinuxPulse::CPULoad(WebRtc_UWord16& /*load*/) const bool AudioDeviceLinuxPulse::PlayoutWarning() const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); return (_playWarning > 0); } bool AudioDeviceLinuxPulse::PlayoutError() const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); return (_playError > 0); } bool AudioDeviceLinuxPulse::RecordingWarning() const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); return (_recWarning > 0); } bool AudioDeviceLinuxPulse::RecordingError() const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); return (_recError > 0); } void AudioDeviceLinuxPulse::ClearPlayoutWarning() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _playWarning = 0; } void AudioDeviceLinuxPulse::ClearPlayoutError() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _playError = 0; } void AudioDeviceLinuxPulse::ClearRecordingWarning() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _recWarning = 0; } void AudioDeviceLinuxPulse::ClearRecordingError() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _recError = 0; } diff --git a/src/modules/audio_device/main/source/linux/audio_device_utility_linux.cc b/src/modules/audio_device/main/source/linux/audio_device_utility_linux.cc index 0b9dd54263..a892e6bea6 100644 --- a/src/modules/audio_device/main/source/linux/audio_device_utility_linux.cc +++ b/src/modules/audio_device/main/source/linux/audio_device_utility_linux.cc @@ -29,7 +29,7 @@ AudioDeviceUtilityLinux::~AudioDeviceUtilityLinux() WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s destroyed", __FUNCTION__); { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // free stuff here... } diff --git a/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.cc b/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.cc index 306ad5dbbc..2e12f0ac57 100644 --- a/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.cc +++ b/src/modules/audio_device/main/source/linux/audio_mixer_manager_alsa_linux.cc @@ -58,7 +58,7 @@ WebRtc_Word32 AudioMixerManagerLinuxALSA::Close() WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); CloseSpeaker(); CloseMicrophone(); @@ -72,7 +72,7 @@ WebRtc_Word32 AudioMixerManagerLinuxALSA::CloseSpeaker() WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); int errVal = 0; @@ -113,7 +113,7 @@ WebRtc_Word32 AudioMixerManagerLinuxALSA::CloseMicrophone() { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); int errVal = 0; @@ -165,7 +165,7 @@ WebRtc_Word32 AudioMixerManagerLinuxALSA::OpenSpeaker(char* deviceName) WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManagerLinuxALSA::OpenSpeaker(name=%s)", deviceName); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); int errVal = 0; @@ -259,7 +259,7 @@ WebRtc_Word32 AudioMixerManagerLinuxALSA::OpenMicrophone(char *deviceName) "AudioMixerManagerLinuxALSA::OpenMicrophone(name=%s)", deviceName); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); int errVal = 0; @@ -378,7 +378,7 @@ WebRtc_Word32 AudioMixerManagerLinuxALSA::SetSpeakerVolume( "AudioMixerManagerLinuxALSA::SetSpeakerVolume(volume=%u)", volume); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_outputMixerElement == NULL) { @@ -642,7 +642,7 @@ WebRtc_Word32 AudioMixerManagerLinuxALSA::SetSpeakerMute(bool enable) "AudioMixerManagerLinuxALSA::SetSpeakerMute(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_outputMixerElement == NULL) { @@ -739,7 +739,7 @@ WebRtc_Word32 AudioMixerManagerLinuxALSA::SetMicrophoneMute(bool enable) "AudioMixerManagerLinuxALSA::SetMicrophoneMute(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputMixerElement == NULL) { @@ -838,7 +838,7 @@ WebRtc_Word32 AudioMixerManagerLinuxALSA::SetMicrophoneBoost(bool enable) "AudioMixerManagerLinuxALSA::SetMicrophoneBoost(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputMixerHandle == NULL) { @@ -900,7 +900,7 @@ WebRtc_Word32 AudioMixerManagerLinuxALSA::SetMicrophoneVolume( "AudioMixerManagerLinuxALSA::SetMicrophoneVolume(volume=%u)", volume); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputMixerElement == NULL) { diff --git a/src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.cc b/src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.cc index 4c5f80e8ab..7094d53c64 100644 --- a/src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.cc +++ b/src/modules/audio_device/main/source/linux/audio_mixer_manager_pulse_linux.cc @@ -69,7 +69,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::SetPulseAudioObjects( WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!mainloop || !context) { @@ -93,7 +93,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::Close() WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); CloseSpeaker(); CloseMicrophone(); @@ -111,7 +111,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::CloseSpeaker() WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Reset the index to -1 _paOutputDeviceIndex = -1; @@ -125,7 +125,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::CloseMicrophone() WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Reset the index to -1 _paInputDeviceIndex = -1; @@ -139,7 +139,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::SetPlayStream(pa_stream* playStream) WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManagerLinuxPulse::SetPlayStream(playStream)"); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _paPlayStream = playStream; return 0; } @@ -149,7 +149,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::SetRecStream(pa_stream* recStream) WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManagerLinuxPulse::SetRecStream(recStream)"); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _paRecStream = recStream; return 0; } @@ -161,7 +161,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::OpenSpeaker( "AudioMixerManagerLinuxPulse::OpenSpeaker(deviceIndex=%d)", deviceIndex); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // No point in opening the speaker // if PA objects have not been set @@ -192,7 +192,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::OpenMicrophone( "AudioMixerManagerLinuxPulse::OpenMicrophone(deviceIndex=%d)", deviceIndex); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // No point in opening the microphone // if PA objects have not been set @@ -236,7 +236,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::SetSpeakerVolume( "AudioMixerManagerLinuxPulse::SetSpeakerVolume(volume=%u)", volume); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_paOutputDeviceIndex == -1) { @@ -431,7 +431,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::SetSpeakerMute(bool enable) "AudioMixerManagerLinuxPulse::SetSpeakerMute(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_paOutputDeviceIndex == -1) { @@ -627,7 +627,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::SetMicrophoneMute(bool enable) "AudioMixerManagerLinuxPulse::SetMicrophoneMute(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_paInputDeviceIndex == -1) { @@ -747,7 +747,7 @@ WebRtc_Word32 AudioMixerManagerLinuxPulse::SetMicrophoneBoost(bool enable) "AudioMixerManagerLinuxPulse::SetMicrophoneBoost(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_paInputDeviceIndex == -1) { @@ -810,7 +810,7 @@ AudioMixerManagerLinuxPulse::SetMicrophoneVolume(WebRtc_UWord32 volume) "AudioMixerManagerLinuxPulse::SetMicrophoneVolume(volume=%u)", volume); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_paInputDeviceIndex == -1) { diff --git a/src/modules/audio_device/main/source/mac/audio_device_mac.cc b/src/modules/audio_device/main/source/mac/audio_device_mac.cc index 9350d705b5..6d44368c84 100644 --- a/src/modules/audio_device/main/source/mac/audio_device_mac.cc +++ b/src/modules/audio_device/main/source/mac/audio_device_mac.cc @@ -243,7 +243,7 @@ AudioDeviceMac::~AudioDeviceMac() void AudioDeviceMac::AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _ptrAudioBuffer = audioBuffer; @@ -264,7 +264,7 @@ WebRtc_Word32 AudioDeviceMac::ActiveAudioLayer( WebRtc_Word32 AudioDeviceMac::Init() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_initialized) { @@ -513,7 +513,7 @@ WebRtc_Word32 AudioDeviceMac::SpeakerIsAvailable(bool& available) WebRtc_Word32 AudioDeviceMac::InitSpeaker() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -573,7 +573,7 @@ WebRtc_Word32 AudioDeviceMac::MicrophoneIsAvailable(bool& available) WebRtc_Word32 AudioDeviceMac::InitMicrophone() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -1287,7 +1287,7 @@ WebRtc_Word32 AudioDeviceMac::RecordingIsAvailable(bool& available) WebRtc_Word32 AudioDeviceMac::InitPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -1550,7 +1550,7 @@ WebRtc_Word32 AudioDeviceMac::InitPlayout() WebRtc_Word32 AudioDeviceMac::InitRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -1766,7 +1766,7 @@ WebRtc_Word32 AudioDeviceMac::InitRecording() WebRtc_Word32 AudioDeviceMac::StartRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { @@ -1810,7 +1810,7 @@ WebRtc_Word32 AudioDeviceMac::StartRecording() WebRtc_Word32 AudioDeviceMac::StopRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { @@ -1830,7 +1830,7 @@ WebRtc_Word32 AudioDeviceMac::StopRecording() _critSect.Leave(); // Cannot be under lock, risk of deadlock if (kEventTimeout == _stopEventRec.Wait(2000)) { - CriticalSectionScoped critScoped(_critSect); + CriticalSectionScoped critScoped(&_critSect); WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, " Timed out stopping the capture IOProc. " "We may have failed to detect a device removal."); @@ -1863,7 +1863,7 @@ WebRtc_Word32 AudioDeviceMac::StopRecording() _critSect.Leave(); // Cannot be under lock, risk of deadlock if (kEventTimeout == _stopEvent.Wait(2000)) { - CriticalSectionScoped critScoped(_critSect); + CriticalSectionScoped critScoped(&_critSect); WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, " Timed out stopping the shared IOProc. " "We may have failed to detect a device removal."); @@ -1933,7 +1933,7 @@ bool AudioDeviceMac::PlayoutIsInitialized() const WebRtc_Word32 AudioDeviceMac::StartPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { @@ -1966,7 +1966,7 @@ WebRtc_Word32 AudioDeviceMac::StartPlayout() WebRtc_Word32 AudioDeviceMac::StopPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { @@ -1990,7 +1990,7 @@ WebRtc_Word32 AudioDeviceMac::StopPlayout() _critSect.Leave(); // Cannot be under lock, risk of deadlock if (kEventTimeout == _stopEvent.Wait(2000)) { - CriticalSectionScoped critScoped(_critSect); + CriticalSectionScoped critScoped(&_critSect); WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, _id, " Timed out stopping the render IOProc. " "We may have failed to detect a device removal."); diff --git a/src/modules/audio_device/main/source/mac/audio_device_utility_mac.cc b/src/modules/audio_device/main/source/mac/audio_device_utility_mac.cc index 94bdf2638c..d4b349d2ba 100644 --- a/src/modules/audio_device/main/source/mac/audio_device_utility_mac.cc +++ b/src/modules/audio_device/main/source/mac/audio_device_utility_mac.cc @@ -34,7 +34,7 @@ AudioDeviceUtilityMac::~AudioDeviceUtilityMac() WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s destroyed", __FUNCTION__); { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // free stuff here... } diff --git a/src/modules/audio_device/main/source/mac/audio_mixer_manager_mac.cc b/src/modules/audio_device/main/source/mac/audio_mixer_manager_mac.cc index 40850d4781..bd53c57247 100644 --- a/src/modules/audio_device/main/source/mac/audio_mixer_manager_mac.cc +++ b/src/modules/audio_device/main/source/mac/audio_mixer_manager_mac.cc @@ -74,7 +74,7 @@ WebRtc_Word32 AudioMixerManagerMac::Close() WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); CloseSpeaker(); CloseMicrophone(); @@ -88,7 +88,7 @@ WebRtc_Word32 AudioMixerManagerMac::CloseSpeaker() WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _outputDeviceID = kAudioObjectUnknown; _noOutputChannels = 0; @@ -101,7 +101,7 @@ WebRtc_Word32 AudioMixerManagerMac::CloseMicrophone() WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _inputDeviceID = kAudioObjectUnknown; _noInputChannels = 0; @@ -114,7 +114,7 @@ WebRtc_Word32 AudioMixerManagerMac::OpenSpeaker(AudioDeviceID deviceID) WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManagerMac::OpenSpeaker(id=%d)", deviceID); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); OSStatus err = noErr; UInt32 size = 0; @@ -169,7 +169,7 @@ WebRtc_Word32 AudioMixerManagerMac::OpenMicrophone(AudioDeviceID deviceID) WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManagerMac::OpenMicrophone(id=%d)", deviceID); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); OSStatus err = noErr; UInt32 size = 0; @@ -238,7 +238,7 @@ WebRtc_Word32 AudioMixerManagerMac::SetSpeakerVolume(WebRtc_UWord32 volume) WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManagerMac::SetSpeakerVolume(volume=%u)", volume); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_outputDeviceID == kAudioObjectUnknown) { @@ -519,7 +519,7 @@ WebRtc_Word32 AudioMixerManagerMac::SetSpeakerMute(bool enable) WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManagerMac::SetSpeakerMute(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_outputDeviceID == kAudioObjectUnknown) { @@ -719,7 +719,7 @@ WebRtc_Word32 AudioMixerManagerMac::SetMicrophoneMute(bool enable) WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManagerMac::SetMicrophoneMute(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputDeviceID == kAudioObjectUnknown) { @@ -863,7 +863,7 @@ WebRtc_Word32 AudioMixerManagerMac::SetMicrophoneBoost(bool enable) WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManagerMac::SetMicrophoneBoost(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputDeviceID == kAudioObjectUnknown) { @@ -953,7 +953,7 @@ WebRtc_Word32 AudioMixerManagerMac::SetMicrophoneVolume(WebRtc_UWord32 volume) WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManagerMac::SetMicrophoneVolume(volume=%u)", volume); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputDeviceID == kAudioObjectUnknown) { diff --git a/src/modules/audio_device/main/source/win/audio_device_core_win.cc b/src/modules/audio_device/main/source/win/audio_device_core_win.cc index bbc3692b0e..a1e19acabd 100644 --- a/src/modules/audio_device/main/source/win/audio_device_core_win.cc +++ b/src/modules/audio_device/main/source/win/audio_device_core_win.cc @@ -682,7 +682,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::ActiveAudioLayer(AudioDeviceModule::AudioL WebRtc_Word32 AudioDeviceWindowsCore::Init() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_initialized) { @@ -713,7 +713,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::Init() WebRtc_Word32 AudioDeviceWindowsCore::Terminate() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_initialized) { return 0; @@ -755,7 +755,7 @@ bool AudioDeviceWindowsCore::Initialized() const WebRtc_Word32 AudioDeviceWindowsCore::SpeakerIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_ptrDeviceOut == NULL) { @@ -774,7 +774,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::SpeakerIsAvailable(bool& available) WebRtc_Word32 AudioDeviceWindowsCore::InitSpeaker() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -856,7 +856,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::InitSpeaker() WebRtc_Word32 AudioDeviceWindowsCore::MicrophoneIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_ptrDeviceIn == NULL) { @@ -875,7 +875,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::MicrophoneIsAvailable(bool& available) WebRtc_Word32 AudioDeviceWindowsCore::InitMicrophone() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -964,7 +964,7 @@ bool AudioDeviceWindowsCore::MicrophoneIsInitialized() const WebRtc_Word32 AudioDeviceWindowsCore::SpeakerVolumeIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_ptrDeviceOut == NULL) { @@ -1009,7 +1009,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::SetSpeakerVolume(WebRtc_UWord32 volume) { { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_speakerIsInitialized) { @@ -1052,7 +1052,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::SpeakerVolume(WebRtc_UWord32& volume) cons { { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_speakerIsInitialized) { @@ -1164,7 +1164,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::SpeakerVolumeStepSize(WebRtc_UWord16& step WebRtc_Word32 AudioDeviceWindowsCore::SpeakerMuteIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_ptrDeviceOut == NULL) { @@ -1203,7 +1203,7 @@ Exit: WebRtc_Word32 AudioDeviceWindowsCore::SetSpeakerMute(bool enable) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_speakerIsInitialized) { @@ -1283,7 +1283,7 @@ Exit: WebRtc_Word32 AudioDeviceWindowsCore::MicrophoneMuteIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_ptrDeviceIn == NULL) { @@ -1443,7 +1443,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::StereoRecordingIsAvailable(bool& available WebRtc_Word32 AudioDeviceWindowsCore::SetStereoRecording(bool enable) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (enable) { @@ -1494,7 +1494,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::StereoPlayoutIsAvailable(bool& available) WebRtc_Word32 AudioDeviceWindowsCore::SetStereoPlayout(bool enable) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (enable) { @@ -1533,7 +1533,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::StereoPlayout(bool& enabled) const WebRtc_Word32 AudioDeviceWindowsCore::SetAGC(bool enable) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _AGC = enable; return 0; } @@ -1544,7 +1544,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::SetAGC(bool enable) bool AudioDeviceWindowsCore::AGC() const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); return _AGC; } @@ -1555,7 +1555,7 @@ bool AudioDeviceWindowsCore::AGC() const WebRtc_Word32 AudioDeviceWindowsCore::MicrophoneVolumeIsAvailable(bool& available) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_ptrDeviceIn == NULL) { @@ -1594,7 +1594,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::SetMicrophoneVolume(WebRtc_UWord32 volume) WEBRTC_TRACE(kTraceStream, kTraceAudioDevice, _id, "AudioDeviceWindowsCore::SetMicrophoneVolume(volume=%u)", volume); { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_microphoneIsInitialized) { @@ -1635,7 +1635,7 @@ Exit: WebRtc_Word32 AudioDeviceWindowsCore::MicrophoneVolume(WebRtc_UWord32& volume) const { { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_microphoneIsInitialized) { @@ -1730,7 +1730,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::MicrophoneVolumeStepSize(WebRtc_UWord16& s WebRtc_Word16 AudioDeviceWindowsCore::PlayoutDevices() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_RefreshDeviceList(eRender) != -1) { @@ -1761,7 +1761,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::SetPlayoutDevice(WebRtc_UWord16 index) return -1; } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); HRESULT hr(S_OK); @@ -1816,7 +1816,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::SetPlayoutDevice(AudioDeviceModule::Window role = eCommunications; } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Refresh the list of rendering endpoint devices _RefreshDeviceList(eRender); @@ -1886,7 +1886,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::PlayoutDeviceName( memset(guid, 0, kAdmMaxGuidSize); } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); WebRtc_Word32 ret(-1); WCHAR szDeviceName[MAX_PATH]; @@ -1966,7 +1966,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::RecordingDeviceName( memset(guid, 0, kAdmMaxGuidSize); } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); WebRtc_Word32 ret(-1); WCHAR szDeviceName[MAX_PATH]; @@ -2020,7 +2020,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::RecordingDeviceName( WebRtc_Word16 AudioDeviceWindowsCore::RecordingDevices() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_RefreshDeviceList(eCapture) != -1) { @@ -2051,7 +2051,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::SetRecordingDevice(WebRtc_UWord16 index) return -1; } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); HRESULT hr(S_OK); @@ -2106,7 +2106,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::SetRecordingDevice(AudioDeviceModule::Wind role = eCommunications; } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Refresh the list of capture endpoint devices _RefreshDeviceList(eCapture); @@ -2196,7 +2196,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::RecordingIsAvailable(bool& available) WebRtc_Word32 AudioDeviceWindowsCore::InitPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -2538,7 +2538,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::InitRecordingDMO() WebRtc_Word32 AudioDeviceWindowsCore::InitRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -2785,7 +2785,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::StartRecording() } { - CriticalSectionScoped critScoped(_critSect); + CriticalSectionScoped critScoped(&_critSect); // Create thread which will drive the capturing LPTHREAD_START_ROUTINE lpStartAddress = WSAPICaptureThread; @@ -3035,7 +3035,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::StartPlayout() } { - CriticalSectionScoped critScoped(_critSect); + CriticalSectionScoped critScoped(&_critSect); // Create thread which will drive the rendering. assert(_hPlayThread == NULL); @@ -3085,7 +3085,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::StopPlayout() } { - CriticalSectionScoped critScoped(_critSect) ; + CriticalSectionScoped critScoped(&_critSect) ; if (_hPlayThread == NULL) { @@ -3118,7 +3118,7 @@ WebRtc_Word32 AudioDeviceWindowsCore::StopPlayout() } { - CriticalSectionScoped critScoped(_critSect); + CriticalSectionScoped critScoped(&_critSect); WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "webrtc_core_audio_render_thread is now closed"); @@ -3191,7 +3191,7 @@ bool AudioDeviceWindowsCore::Playing() const WebRtc_Word32 AudioDeviceWindowsCore::SetPlayoutBuffer(const AudioDeviceModule::BufferType type, WebRtc_UWord16 sizeMS) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _playBufType = type; @@ -3210,13 +3210,13 @@ WebRtc_Word32 AudioDeviceWindowsCore::SetPlayoutBuffer(const AudioDeviceModule:: WebRtc_Word32 AudioDeviceWindowsCore::PlayoutBuffer(AudioDeviceModule::BufferType& type, WebRtc_UWord16& sizeMS) const { { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); type = _playBufType; } if (type == AudioDeviceModule::kFixedBufferSize) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); sizeMS = _playBufDelayFixed; } else @@ -3798,7 +3798,7 @@ DWORD AudioDeviceWindowsCore::DoCaptureThreadPollDMO() while (keepRecording) { - CriticalSectionScoped critScoped(_critSect); + CriticalSectionScoped critScoped(&_critSect); DWORD dwStatus = 0; { diff --git a/src/modules/audio_device/main/source/win/audio_device_utility_win.cc b/src/modules/audio_device/main/source/win/audio_device_utility_win.cc index 010ef3a338..49fb522299 100644 --- a/src/modules/audio_device/main/source/win/audio_device_utility_win.cc +++ b/src/modules/audio_device/main/source/win/audio_device_utility_win.cc @@ -50,7 +50,7 @@ AudioDeviceUtilityWindows::~AudioDeviceUtilityWindows() { WEBRTC_TRACE(kTraceMemory, kTraceAudioDevice, _id, "%s destroyed", __FUNCTION__); { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // free stuff here... } diff --git a/src/modules/audio_device/main/source/win/audio_device_wave_win.cc b/src/modules/audio_device/main/source/win/audio_device_wave_win.cc index 1b9fc6cebd..3542e5dda5 100644 --- a/src/modules/audio_device/main/source/win/audio_device_wave_win.cc +++ b/src/modules/audio_device/main/source/win/audio_device_wave_win.cc @@ -174,7 +174,7 @@ AudioDeviceWindowsWave::~AudioDeviceWindowsWave() void AudioDeviceWindowsWave::AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _ptrAudioBuffer = audioBuffer; @@ -202,7 +202,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::ActiveAudioLayer(AudioDeviceModule::AudioL WebRtc_Word32 AudioDeviceWindowsWave::Init() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_initialized) { @@ -523,7 +523,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::SpeakerIsAvailable(bool& available) WebRtc_Word32 AudioDeviceWindowsWave::InitSpeaker() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -588,7 +588,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::MicrophoneIsAvailable(bool& available) WebRtc_Word32 AudioDeviceWindowsWave::InitMicrophone() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -735,7 +735,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::SetWaveOutVolume(WebRtc_UWord16 volumeLeft MMRESULT res(0); WAVEOUTCAPS caps; - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_hWaveOut == NULL) { @@ -799,7 +799,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::WaveOutVolume(WebRtc_UWord16& volumeLeft, MMRESULT res(0); WAVEOUTCAPS caps; - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_hWaveOut == NULL) { @@ -1696,7 +1696,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::RecordingIsAvailable(bool& available) WebRtc_Word32 AudioDeviceWindowsWave::InitPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_playing) { @@ -1892,7 +1892,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::InitPlayout() WebRtc_Word32 AudioDeviceWindowsWave::InitRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_recording) { @@ -2085,7 +2085,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::StartRecording() WebRtc_Word32 AudioDeviceWindowsWave::StopRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_recIsInitialized) { @@ -2236,7 +2236,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::StartPlayout() WebRtc_Word32 AudioDeviceWindowsWave::StopPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (!_playIsInitialized) { @@ -2308,7 +2308,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::StopPlayout() WebRtc_Word32 AudioDeviceWindowsWave::PlayoutDelay(WebRtc_UWord16& delayMS) const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); delayMS = (WebRtc_UWord16)_sndCardPlayDelay; return 0; } @@ -2319,7 +2319,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::PlayoutDelay(WebRtc_UWord16& delayMS) cons WebRtc_Word32 AudioDeviceWindowsWave::RecordingDelay(WebRtc_UWord16& delayMS) const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); delayMS = (WebRtc_UWord16)_sndCardRecDelay; return 0; } @@ -2338,7 +2338,7 @@ bool AudioDeviceWindowsWave::Playing() const WebRtc_Word32 AudioDeviceWindowsWave::SetPlayoutBuffer(const AudioDeviceModule::BufferType type, WebRtc_UWord16 sizeMS) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); _playBufType = type; if (type == AudioDeviceModule::kFixedBufferSize) { @@ -2353,7 +2353,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::SetPlayoutBuffer(const AudioDeviceModule:: WebRtc_Word32 AudioDeviceWindowsWave::PlayoutBuffer(AudioDeviceModule::BufferType& type, WebRtc_UWord16& sizeMS) const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); type = _playBufType; if (type == AudioDeviceModule::kFixedBufferSize) { @@ -2667,7 +2667,7 @@ void AudioDeviceWindowsWave::TraceWaveOutError(MMRESULT error) const WebRtc_Word32 AudioDeviceWindowsWave::PrepareStartPlayout() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_hWaveOut == NULL) { @@ -2704,7 +2704,7 @@ WebRtc_Word32 AudioDeviceWindowsWave::PrepareStartPlayout() WebRtc_Word32 AudioDeviceWindowsWave::PrepareStartRecording() { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_hWaveIn == NULL) { diff --git a/src/modules/audio_device/main/source/win/audio_mixer_manager_win.cc b/src/modules/audio_device/main/source/win/audio_mixer_manager_win.cc index b9b5caad59..a1dbcb5c3c 100644 --- a/src/modules/audio_device/main/source/win/audio_mixer_manager_win.cc +++ b/src/modules/audio_device/main/source/win/audio_mixer_manager_win.cc @@ -63,7 +63,7 @@ WebRtc_Word32 AudioMixerManager::Close() { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_outputMixerHandle != NULL) { @@ -87,7 +87,7 @@ WebRtc_Word32 AudioMixerManager::CloseSpeaker() { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_outputMixerHandle == NULL) { @@ -110,7 +110,7 @@ WebRtc_Word32 AudioMixerManager::CloseMicrophone() { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "%s", __FUNCTION__); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputMixerHandle == NULL) { @@ -576,7 +576,7 @@ WebRtc_Word32 AudioMixerManager::OpenSpeaker(AudioDeviceModule::WindowsDeviceTyp WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManager::OpenSpeaker(kDefaultCommunicationDevice)"); } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Close any existing output mixer handle // @@ -695,7 +695,7 @@ WebRtc_Word32 AudioMixerManager::OpenSpeaker(WebRtc_UWord16 index) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManager::OpenSpeaker(index=%d)", index); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Close any existing output mixer handle // @@ -798,7 +798,7 @@ WebRtc_Word32 AudioMixerManager::OpenMicrophone(AudioDeviceModule::WindowsDevice WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManager::OpenMicrophone(kDefaultCommunicationDevice)"); } - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Close any existing output mixer handle // @@ -917,7 +917,7 @@ WebRtc_Word32 AudioMixerManager::OpenMicrophone(WebRtc_UWord16 index) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManager::OpenMicrophone(index=%d)", index); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); // Close any existing input mixer handle // @@ -1032,7 +1032,7 @@ WebRtc_Word32 AudioMixerManager::SetSpeakerVolume(WebRtc_UWord32 volume) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManager::SetSpeakerVolume(volume=%u)", volume); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_outputMixerHandle == NULL) { @@ -1219,7 +1219,7 @@ WebRtc_Word32 AudioMixerManager::SetSpeakerMute(bool enable) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManager::SetSpeakerMute(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_outputMixerHandle == NULL) { @@ -1314,7 +1314,7 @@ WebRtc_Word32 AudioMixerManager::SetMicrophoneMute(bool enable) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManager::SetMicrophoneMute(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputMixerHandle == NULL) { @@ -1407,7 +1407,7 @@ WebRtc_Word32 AudioMixerManager::SetMicrophoneBoost(bool enable) { WEBRTC_TRACE(kTraceInfo, kTraceAudioDevice, _id, "AudioMixerManager::SetMicrophoneBoost(enable=%u)", enable); - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputMixerHandle == NULL) { @@ -1498,7 +1498,7 @@ WebRtc_Word32 AudioMixerManager::MicrophoneVolumeIsAvailable(bool& available) WebRtc_Word32 AudioMixerManager::SetMicrophoneVolume(WebRtc_UWord32 volume) { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputMixerHandle == NULL) { @@ -1526,7 +1526,7 @@ WebRtc_Word32 AudioMixerManager::SetMicrophoneVolume(WebRtc_UWord32 volume) WebRtc_Word32 AudioMixerManager::MicrophoneVolume(WebRtc_UWord32& volume) const { - CriticalSectionScoped lock(_critSect); + CriticalSectionScoped lock(&_critSect); if (_inputMixerHandle == NULL) {