Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1068)

Unified Diff: media/audio/win/waveout_output_win.h

Issue 1911913002: Convert //media/audio from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cast + windows build Created 4 years, 8 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
« media/audio/win/wavein_input_win.h ('K') | « media/audio/win/wavein_input_win.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/win/waveout_output_win.h
diff --git a/media/audio/win/waveout_output_win.h b/media/audio/win/waveout_output_win.h
index 4ff14447afe3b4f14e1c95269a4edd70210c781c..152d7505187167198d30b50b4e47b4e682a1a063 100644
--- a/media/audio/win/waveout_output_win.h
+++ b/media/audio/win/waveout_output_win.h
@@ -11,8 +11,9 @@
#include <stddef.h>
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/synchronization/lock.h"
#include "base/win/scoped_handle.h"
#include "media/audio/audio_io.h"
@@ -127,13 +128,13 @@ class PCMWaveOutAudioOutputStream : public AudioOutputStream {
// Pointer to the allocated audio buffers, we allocate all buffers in one big
// chunk. This object owns them.
- scoped_ptr<char[]> buffers_;
+ std::unique_ptr<char[]> buffers_;
// Lock used to avoid the conflict when callbacks are called simultaneously.
base::Lock lock_;
// Container for retrieving data from AudioSourceCallback::OnMoreData().
- scoped_ptr<AudioBus> audio_bus_;
+ std::unique_ptr<AudioBus> audio_bus_;
DISALLOW_COPY_AND_ASSIGN(PCMWaveOutAudioOutputStream);
};
« media/audio/win/wavein_input_win.h ('K') | « media/audio/win/wavein_input_win.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698