webrtc/modules/audio_device/audio_device_impl.h - Issue 1722083002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_device/

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_device/audio_device_impl.h

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

Patch Set: Created 4 years, 10 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_device/android/opensles_player.h ('k') | webrtc/modules/audio_device/dummy/file_audio_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_device/audio_device_impl.h

diff --git a/webrtc/modules/audio_device/audio_device_impl.h b/webrtc/modules/audio_device/audio_device_impl.h

index 5109693964005f598b5c598a43022bf81c3661ef..c7312bf4b0a062bbd0152454df4ce9eb55236f64 100644

--- a/webrtc/modules/audio_device/audio_device_impl.h

+++ b/webrtc/modules/audio_device/audio_device_impl.h

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

#if defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE)

+#include <memory>

#include "webrtc/base/checks.h"

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

#include "webrtc/modules/audio_device/audio_device_buffer.h"

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

@@ -216,7 +217,7 @@ class AudioDeviceModuleImpl : public AudioDeviceModule {

AudioDeviceBuffer _audioDeviceBuffer;

#if defined(WEBRTC_ANDROID)

- rtc::scoped_ptr<AudioManager> _audioManagerAndroid;

+ std::unique_ptr<AudioManager> _audioManagerAndroid;

#endif

int32_t _id;

AudioLayer _platformAudioLayer;

« no previous file with comments | « webrtc/modules/audio_device/android/opensles_player.h ('k') | webrtc/modules/audio_device/dummy/file_audio_device.h » ('j') | no next file with comments »