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

Unified Diff: media/audio/alsa/alsa_output.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: . 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
« no previous file with comments | « media/audio/alsa/alsa_input.h ('k') | media/audio/alsa/alsa_output.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/alsa/alsa_output.h
diff --git a/media/audio/alsa/alsa_output.h b/media/audio/alsa/alsa_output.h
index 964ca4fd921552c36a26116fba836c6cad24bb28..0a7b861b3e218b161cc5c97225e12e864b990b25 100644
--- a/media/audio/alsa/alsa_output.h
+++ b/media/audio/alsa/alsa_output.h
@@ -24,12 +24,12 @@
#include <alsa/asoundlib.h>
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "media/audio/audio_io.h"
@@ -200,7 +200,7 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream {
// Handle to the actual PCM playback device.
snd_pcm_t* playback_handle_;
- scoped_ptr<media::SeekableBuffer> buffer_;
+ std::unique_ptr<media::SeekableBuffer> buffer_;
uint32_t frames_per_packet_;
InternalState state_;
@@ -209,11 +209,11 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream {
AudioSourceCallback* source_callback_;
// Container for retrieving data from AudioSourceCallback::OnMoreData().
- scoped_ptr<AudioBus> audio_bus_;
+ std::unique_ptr<AudioBus> audio_bus_;
// Channel mixer and temporary bus for the final mixed channel data.
- scoped_ptr<ChannelMixer> channel_mixer_;
- scoped_ptr<AudioBus> mixed_audio_bus_;
+ std::unique_ptr<ChannelMixer> channel_mixer_;
+ std::unique_ptr<AudioBus> mixed_audio_bus_;
// Allows us to run tasks on the AlsaPcmOutputStream instance which are
// bound by its lifetime.
« no previous file with comments | « media/audio/alsa/alsa_input.h ('k') | media/audio/alsa/alsa_output.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698