| Index: webrtc/modules/audio_processing/agc/agc_manager_direct.h
|
| diff --git a/webrtc/modules/audio_processing/agc/agc_manager_direct.h b/webrtc/modules/audio_processing/agc/agc_manager_direct.h
|
| index 6edb0f7bf137b22b81e4cdcda76d4da083afaa58..6b16e8b776dc8236635949da66c9ee93d91f55e8 100644
|
| --- a/webrtc/modules/audio_processing/agc/agc_manager_direct.h
|
| +++ b/webrtc/modules/audio_processing/agc/agc_manager_direct.h
|
| @@ -11,7 +11,9 @@
|
| #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_
|
| #define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_MANAGER_DIRECT_H_
|
|
|
| -#include "webrtc/base/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| +#include "webrtc/base/constructormagic.h"
|
| #include "webrtc/modules/audio_processing/agc/agc.h"
|
|
|
| namespace webrtc {
|
| @@ -81,7 +83,7 @@ class AgcManagerDirect final {
|
| void UpdateGain();
|
| void UpdateCompressor();
|
|
|
| - rtc::scoped_ptr<Agc> agc_;
|
| + std::unique_ptr<Agc> agc_;
|
| GainControl* gctrl_;
|
| VolumeCallbacks* volume_callbacks_;
|
|
|
| @@ -97,8 +99,8 @@ class AgcManagerDirect final {
|
| bool startup_;
|
| int startup_min_level_;
|
|
|
| - rtc::scoped_ptr<DebugFile> file_preproc_;
|
| - rtc::scoped_ptr<DebugFile> file_postproc_;
|
| + std::unique_ptr<DebugFile> file_preproc_;
|
| + std::unique_ptr<DebugFile> file_postproc_;
|
|
|
| RTC_DISALLOW_COPY_AND_ASSIGN(AgcManagerDirect);
|
| };
|
|
|