summaryrefslogtreecommitdiffstats
path: root/media/audio/linux/alsa_output.h
diff options
context:
space:
mode:
Diffstat (limited to 'media/audio/linux/alsa_output.h')
-rw-r--r--media/audio/linux/alsa_output.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/media/audio/linux/alsa_output.h b/media/audio/linux/alsa_output.h
index 7415821..736015e 100644
--- a/media/audio/linux/alsa_output.h
+++ b/media/audio/linux/alsa_output.h
@@ -152,9 +152,7 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream {
// is passed into the output stream, but ownership is not transfered which
// requires a synchronization on access of the |source_callback_| to avoid
// using a deleted callback.
- uint32 RunDataCallback(uint8* dest,
- uint32 max_size,
- AudioBuffersState buffers_state);
+ int RunDataCallback(AudioBus* audio_bus, AudioBuffersState buffers_state);
void RunErrorCallback(int code);
// Changes the AudioSourceCallback to proxy calls to. Pass in NULL to
@@ -213,6 +211,9 @@ class MEDIA_EXPORT AlsaPcmOutputStream : public AudioOutputStream {
base::Time last_fill_time_; // Time for the last OnMoreData() callback.
+ // Container for retrieving data from AudioSourceCallback::OnMoreData().
+ scoped_ptr<AudioBus> audio_bus_;
+
DISALLOW_COPY_AND_ASSIGN(AlsaPcmOutputStream);
};