webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h - Issue 1785173002: Replace scoped_ptr with unique_ptr in webrtc/modules/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

Issue 1785173002: Replace scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@up8

Patch Set: Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc ('k') | webrtc/modules/audio_conference_mixer/test/audio_conference_mixer_unittest.cc » ('j') | webrtc/modules/utility/source/coder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

diff --git a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

index 13d30c3a71d0e11ceb83ddbadd536d1c910e3c45..22c6a2353518c683ac87fccfdcde5cd9f328c530 100644

--- a/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

+++ b/webrtc/modules/audio_conference_mixer/source/audio_conference_mixer_impl.h

@@ -13,8 +13,8 @@

#include <list>

#include <map>

+#include <memory>

-#include "webrtc/base/scoped_ptr.h"

#include "webrtc/engine_configurations.h"

#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h"

#include "webrtc/modules/audio_conference_mixer/source/memory_pool.h"

@@ -142,8 +142,8 @@ private:

bool LimitMixedAudio(AudioFrame* mixedAudio) const;

- rtc::scoped_ptr<CriticalSectionWrapper> _crit;

- rtc::scoped_ptr<CriticalSectionWrapper> _cbCrit;

+ std::unique_ptr<CriticalSectionWrapper> _crit;

+ std::unique_ptr<CriticalSectionWrapper> _cbCrit;

int32_t _id;

@@ -179,7 +179,7 @@ private:

int16_t _processCalls;

// Used for inhibiting saturation in mixing.

- rtc::scoped_ptr<AudioProcessing> _limiter;

+ std::unique_ptr<AudioProcessing> _limiter;

};

} // namespace webrtc