| Index: media/audio/fake_audio_output_stream.cc
|
| diff --git a/media/audio/fake_audio_output_stream.cc b/media/audio/fake_audio_output_stream.cc
|
| index d5e0d5f551fb15cf1a696a4d25759d63ff1278be..b919b84ccf986ecb9dd4b5a7ea7b2bc8256b935e 100644
|
| --- a/media/audio/fake_audio_output_stream.cc
|
| +++ b/media/audio/fake_audio_output_stream.cc
|
| @@ -22,7 +22,8 @@ FakeAudioOutputStream::FakeAudioOutputStream(AudioManagerBase* manager,
|
| const AudioParameters& params)
|
| : audio_manager_(manager),
|
| callback_(NULL),
|
| - fake_consumer_(manager->GetWorkerTaskRunner(), params) {
|
| + fake_worker_(manager->GetWorkerTaskRunner(), params),
|
| + audio_bus_(AudioBus::Create(params)) {
|
| }
|
|
|
| FakeAudioOutputStream::~FakeAudioOutputStream() {
|
| @@ -31,19 +32,20 @@ FakeAudioOutputStream::~FakeAudioOutputStream() {
|
|
|
| bool FakeAudioOutputStream::Open() {
|
| DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| + audio_bus_->Zero();
|
| return true;
|
| }
|
|
|
| void FakeAudioOutputStream::Start(AudioSourceCallback* callback) {
|
| DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| callback_ = callback;
|
| - fake_consumer_.Start(base::Bind(
|
| + fake_worker_.Start(base::Bind(
|
| &FakeAudioOutputStream::CallOnMoreData, base::Unretained(this)));
|
| }
|
|
|
| void FakeAudioOutputStream::Stop() {
|
| DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
|
| - fake_consumer_.Stop();
|
| + fake_worker_.Stop();
|
| callback_ = NULL;
|
| }
|
|
|
| @@ -59,9 +61,9 @@ void FakeAudioOutputStream::GetVolume(double* volume) {
|
| *volume = 0;
|
| };
|
|
|
| -void FakeAudioOutputStream::CallOnMoreData(AudioBus* audio_bus) {
|
| +void FakeAudioOutputStream::CallOnMoreData() {
|
| DCHECK(audio_manager_->GetWorkerTaskRunner()->BelongsToCurrentThread());
|
| - callback_->OnMoreData(audio_bus, 0);
|
| + callback_->OnMoreData(audio_bus_.get(), 0);
|
| }
|
|
|
| } // namespace media
|
|
|