Switch OnMoreData() to use AudioBus.

media/audio/pulse/pulse_output.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Creates an audio output stream based on the PulseAudio asynchronous API.
 //
 // If the stream is successfully opened, Close() must be called before the
 // stream is deleted as Close() is responsible for ensuring resource cleanup
 // occurs.
 //
@@ skipping 10 matching lines @@
 
 #include <pulse/pulseaudio.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "media/audio/audio_io.h"
 #include "media/base/channel_layout.h"
 
 namespace media {
 
-class SeekableBuffer;
-
 #if defined(OS_LINUX)
 class AudioManagerLinux;
 typedef AudioManagerLinux AudioManagerPulse;
 #elif defined(OS_OPENBSD)
 class AudioManagerOpenBSD;
 typedef AudioManagerOpenBSD AudioManagerPulse;
 #else
 #error Unsupported platform
 #endif
 
 class AudioParameters;
+class SeekableBuffer;
 
 class PulseAudioOutputStream : public AudioOutputStream {
  public:
   PulseAudioOutputStream(const AudioParameters& params,
                          AudioManagerPulse* manager);
 
   virtual ~PulseAudioOutputStream();
 
   // Implementation of AudioOutputStream.
-  virtual bool Open();
-  virtual void Close();
-  virtual void Start(AudioSourceCallback* callback);
-  virtual void Stop();
-  virtual void SetVolume(double volume);
-  virtual void GetVolume(double* volume);
+  virtual bool Open() OVERRIDE;
+  virtual void Close() OVERRIDE;
+  virtual void Start(AudioSourceCallback* callback) OVERRIDE;
+  virtual void Stop() OVERRIDE;
+  virtual void SetVolume(double volume) OVERRIDE;
+  virtual void GetVolume(double* volume) OVERRIDE;
 
  private:
   // PulseAudio Callbacks.
   static void ContextStateCallback(pa_context* context, void* state_addr);
   static void WriteRequestCallback(pa_stream* playback_handle, size_t length,
                                    void* stream_addr);
 
   // Iterate the PulseAudio mainloop to get write requests.
   void WaitForWriteRequest();
 
   // Get another packet from the data source and write it to the client buffer.
   bool BufferPacketFromSource();
 
   // Fulfill a write request from the write request callback.  If the write
   // can't be finished a first, post a new attempt to the message loop.
   void FulfillWriteRequest(size_t requested_bytes);
 
   // Write data from the client buffer to the PulseAudio stream.
   void WriteToStream(size_t bytes_to_write, size_t* bytes_written);
 
   // API for Proxying calls to the AudioSourceCallback provided during Start().
-  uint32 RunDataCallback(uint8* dest, uint32 max_size,
-                         AudioBuffersState buffers_state);
+  int RunDataCallback(AudioBus* audio_bus, AudioBuffersState buffers_state);
 
   // Close() helper function to free internal structs.
   void Reset();
 
   // Configuration constants from the constructor.  Referencable by all threads
   // since they are constants.
   const ChannelLayout channel_layout_;
   const uint32 channel_count_;
   const pa_sample_format_t sample_format_;
   const uint32 sample_rate_;
@@ skipping 28 matching lines @@
   // set of pa_mainloop iterations.
   bool write_callback_handled_;
 
   // Allows us to run tasks on the PulseAudioOutputStream instance which are
   // bound by its lifetime.
   base::WeakPtrFactory<PulseAudioOutputStream> weak_factory_;
 
   // Callback to audio data source.
   AudioSourceCallback* source_callback_;
 
+  // Container for retrieving data from AudioSourceCallback::OnMoreData().
+  scoped_ptr<AudioBus> audio_bus_;
+
   DISALLOW_COPY_AND_ASSIGN(PulseAudioOutputStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_PULSE_PULSE_OUTPUT_H_