From 7cdcde34605a92417e8983d51101410f7221a4f0 Mon Sep 17 00:00:00 2001 From: "henrike@webrtc.org" Date: Wed, 14 Dec 2011 17:27:58 +0000 Subject: [PATCH] Removed usage of the deprecated critical section constructor in media_file. Review URL: http://webrtc-codereview.appspot.com/321004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1187 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/media_file/source/media_file_impl.cc | 8 ++++---- src/modules/media_file/source/media_file_impl.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/media_file/source/media_file_impl.cc b/src/modules/media_file/source/media_file_impl.cc index 785da493de..7dec8f4ca7 100644 --- a/src/modules/media_file/source/media_file_impl.cc +++ b/src/modules/media_file/source/media_file_impl.cc @@ -39,8 +39,8 @@ void MediaFile::DestroyMediaFile(MediaFile* module) MediaFileImpl::MediaFileImpl(const WebRtc_Word32 id) : _id(id), - _crit(*CriticalSectionWrapper::CreateCriticalSection()), - _callbackCrit(*CriticalSectionWrapper::CreateCriticalSection()), + _crit(CriticalSectionWrapper::CreateCriticalSection()), + _callbackCrit(CriticalSectionWrapper::CreateCriticalSection()), _ptrFileUtilityObj(NULL), codec_info_(), _ptrInStream(NULL), @@ -90,8 +90,8 @@ MediaFileImpl::~MediaFileImpl() } } - delete &_crit; - delete &_callbackCrit; + delete _crit; + delete _callbackCrit; } WebRtc_Word32 MediaFileImpl::Version(WebRtc_Word8* version, diff --git a/src/modules/media_file/source/media_file_impl.h b/src/modules/media_file/source/media_file_impl.h index c0676ef363..1358246db0 100644 --- a/src/modules/media_file/source/media_file_impl.h +++ b/src/modules/media_file/source/media_file_impl.h @@ -223,8 +223,8 @@ private: void HandlePlayCallbacks(WebRtc_Word32 bytesRead); WebRtc_Word32 _id; - CriticalSectionWrapper& _crit; - CriticalSectionWrapper& _callbackCrit; + CriticalSectionWrapper* _crit; + CriticalSectionWrapper* _callbackCrit; ModuleFileUtility* _ptrFileUtilityObj; CodecInst codec_info_;