| Index: trunk/src/media/audio/alsa/alsa_output.cc
|
| ===================================================================
|
| --- trunk/src/media/audio/alsa/alsa_output.cc (revision 290374)
|
| +++ trunk/src/media/audio/alsa/alsa_output.cc (working copy)
|
| @@ -360,7 +360,7 @@
|
| scoped_refptr<media::DataBuffer> packet =
|
| new media::DataBuffer(packet_size_);
|
| int frames_filled = RunDataCallback(
|
| - audio_bus_.get(), hardware_delay);
|
| + audio_bus_.get(), AudioBuffersState(0, hardware_delay));
|
|
|
| size_t packet_size = frames_filled * bytes_per_frame_;
|
| DCHECK_LE(packet_size, packet_size_);
|
| @@ -740,11 +740,11 @@
|
| }
|
|
|
| int AlsaPcmOutputStream::RunDataCallback(AudioBus* audio_bus,
|
| - int total_bytes_delay) {
|
| + AudioBuffersState buffers_state) {
|
| TRACE_EVENT0("audio", "AlsaPcmOutputStream::RunDataCallback");
|
|
|
| if (source_callback_)
|
| - return source_callback_->OnMoreData(audio_bus, total_bytes_delay);
|
| + return source_callback_->OnMoreData(audio_bus, buffers_state);
|
|
|
| return 0;
|
| }
|
|
|