| Index: media/audio/audio_output_controller.cc
|
| diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
|
| index ae879c2fdc106629d4d4b7b004f91fd79373de00..1e70407a5d4b1f97b62a37e42c20aedc4adf702a 100644
|
| --- a/media/audio/audio_output_controller.cc
|
| +++ b/media/audio/audio_output_controller.cc
|
| @@ -137,14 +137,14 @@ void AudioOutputController::DoCreate(bool is_for_device_change) {
|
| audio_manager_->MakeAudioOutputStreamProxy(params_, output_device_id_);
|
| if (!stream_) {
|
| state_ = kError;
|
| - handler_->OnError();
|
| + handler_->OnControllerError();
|
| return;
|
| }
|
|
|
| if (!stream_->Open()) {
|
| DoStopCloseAndClearStream();
|
| state_ = kError;
|
| - handler_->OnError();
|
| + handler_->OnControllerError();
|
| return;
|
| }
|
|
|
| @@ -161,7 +161,7 @@ void AudioOutputController::DoCreate(bool is_for_device_change) {
|
|
|
| // And then report we have been created if we haven't done so already.
|
| if (!is_for_device_change)
|
| - handler_->OnCreated();
|
| + handler_->OnControllerCreated();
|
| }
|
|
|
| void AudioOutputController::DoPlay() {
|
| @@ -196,7 +196,7 @@ void AudioOutputController::DoPlay() {
|
| FROM_HERE, TimeDelta::FromSeconds(5), this,
|
| &AudioOutputController::WedgeCheck);
|
|
|
| - handler_->OnPlaying();
|
| + handler_->OnControllerPlaying();
|
| }
|
|
|
| void AudioOutputController::StopStream() {
|
| @@ -229,7 +229,7 @@ void AudioOutputController::DoPause() {
|
| // a better way to know when it should exit PPB_Audio_Shared::Run().
|
| sync_reader_->UpdatePendingBytes(std::numeric_limits<uint32_t>::max(), 0);
|
|
|
| - handler_->OnPaused();
|
| + handler_->OnControllerPaused();
|
| }
|
|
|
| void AudioOutputController::DoClose() {
|
| @@ -290,7 +290,7 @@ void AudioOutputController::DoSwitchOutputDevice(
|
| void AudioOutputController::DoReportError() {
|
| DCHECK(message_loop_->BelongsToCurrentThread());
|
| if (state_ != kClosed)
|
| - handler_->OnError();
|
| + handler_->OnControllerError();
|
| }
|
|
|
| int AudioOutputController::OnMoreData(base::TimeDelta delay,
|
|
|