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

Unified Diff: media/audio/null_audio_sink.h

Issue 10823175: Switch AudioRenderSink::Callback to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup MCR AudioBus usage. Created 8 years, 4 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/audio_util.cc ('k') | media/audio/null_audio_sink.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/null_audio_sink.h
diff --git a/media/audio/null_audio_sink.h b/media/audio/null_audio_sink.h
index db32df0e1eae6d6f3cba69a2e75f33659c02917b..c528473fc91b1913192f3248b7c206fdd70ff30b 100644
--- a/media/audio/null_audio_sink.h
+++ b/media/audio/null_audio_sink.h
@@ -13,13 +13,13 @@
// audio device or we haven't written an audio implementation for a particular
// platform yet.
-#include <vector>
-
#include "base/md5.h"
+#include "base/memory/scoped_ptr.h"
#include "base/threading/thread.h"
#include "media/base/audio_renderer_sink.h"
namespace media {
+class AudioBus;
class MEDIA_EXPORT NullAudioSink
: NON_EXPORTED_BASE(public AudioRendererSink) {
@@ -53,7 +53,7 @@ class MEDIA_EXPORT NullAudioSink
void SetPlaying(bool is_playing);
// A buffer passed to FillBuffer to advance playback.
- std::vector<float*> audio_data_;
+ scoped_ptr<AudioBus> audio_bus_;
AudioParameters params_;
bool initialized_;
« no previous file with comments | « media/audio/audio_util.cc ('k') | media/audio/null_audio_sink.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698