| Index: content/browser/renderer_host/media/audio_renderer_host.cc
|
| diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc
|
| index 2b6815a71774626ec7ee37415812f0c5b15e2756..fcb29404b64950aa81716f4e03cafc4ee87817cf 100644
|
| --- a/content/browser/renderer_host/media/audio_renderer_host.cc
|
| +++ b/content/browser/renderer_host/media/audio_renderer_host.cc
|
| @@ -238,7 +238,7 @@ void AudioRendererHost::OnCreateStream(
|
| // to the map.
|
| entry->stream_id = stream_id;
|
| audio_entries_.insert(std::make_pair(stream_id, entry.release()));
|
| - GetMediaObserver()->OnSetAudioStreamStatus(this, stream_id, "created");
|
| + OnSetAudioStreamStatus(stream_id, "created");
|
| }
|
|
|
| void AudioRendererHost::OnPlayStream(int stream_id) {
|
| @@ -251,7 +251,7 @@ void AudioRendererHost::OnPlayStream(int stream_id) {
|
| }
|
|
|
| entry->controller->Play();
|
| - GetMediaObserver()->OnSetAudioStreamPlaying(this, stream_id, true);
|
| + OnSetAudioStreamPlaying(stream_id, true);
|
| }
|
|
|
| void AudioRendererHost::OnPauseStream(int stream_id) {
|
| @@ -264,7 +264,7 @@ void AudioRendererHost::OnPauseStream(int stream_id) {
|
| }
|
|
|
| entry->controller->Pause();
|
| - GetMediaObserver()->OnSetAudioStreamPlaying(this, stream_id, false);
|
| + OnSetAudioStreamPlaying(stream_id, false);
|
| }
|
|
|
| void AudioRendererHost::OnFlushStream(int stream_id) {
|
| @@ -277,13 +277,13 @@ void AudioRendererHost::OnFlushStream(int stream_id) {
|
| }
|
|
|
| entry->controller->Flush();
|
| - GetMediaObserver()->OnSetAudioStreamStatus(this, stream_id, "flushed");
|
| + OnSetAudioStreamStatus(stream_id, "flushed");
|
| }
|
|
|
| void AudioRendererHost::OnCloseStream(int stream_id) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| - GetMediaObserver()->OnSetAudioStreamStatus(this, stream_id, "closed");
|
| + OnSetAudioStreamStatus(stream_id, "closed");
|
|
|
| AudioEntry* entry = LookupById(stream_id);
|
|
|
| @@ -304,7 +304,7 @@ void AudioRendererHost::OnSetVolume(int stream_id, double volume) {
|
| if (volume < 0 || volume > 1.0)
|
| return;
|
| entry->controller->SetVolume(volume);
|
| - GetMediaObserver()->OnSetAudioStreamVolume(this, stream_id, volume);
|
| + OnSetAudioStreamVolume(stream_id, volume);
|
| }
|
|
|
| void AudioRendererHost::SendErrorMessage(int32 stream_id) {
|
| @@ -348,7 +348,7 @@ void AudioRendererHost::DeleteEntry(AudioEntry* entry) {
|
| audio_entries_.erase(entry->stream_id);
|
|
|
| // Notify the media observer.
|
| - GetMediaObserver()->OnDeleteAudioStream(this, entry->stream_id);
|
| + OnDeleteAudioStream(entry->stream_id);
|
| }
|
|
|
| void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) {
|
| @@ -358,7 +358,7 @@ void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) {
|
| // |entry| is destroyed in DeleteEntry().
|
| SendErrorMessage(entry->stream_id);
|
|
|
| - GetMediaObserver()->OnSetAudioStreamStatus(this, entry->stream_id, "error");
|
| + OnSetAudioStreamStatus(entry->stream_id, "error");
|
| CloseAndDeleteStream(entry);
|
| }
|
|
|
| @@ -385,6 +385,31 @@ AudioRendererHost::AudioEntry* AudioRendererHost::LookupByController(
|
| return NULL;
|
| }
|
|
|
| +void AudioRendererHost::OnSetAudioStreamPlaying(int stream_id, bool playing) {
|
| + if (!GetMediaObserver())
|
| + return;
|
| + GetMediaObserver()->OnSetAudioStreamPlaying(this, stream_id, playing);
|
| +}
|
| +
|
| +void AudioRendererHost::OnSetAudioStreamStatus(int stream_id,
|
| + const std::string& status) {
|
| + if (!GetMediaObserver())
|
| + return;
|
| + GetMediaObserver()->OnSetAudioStreamStatus(this, stream_id, status);
|
| +}
|
| +
|
| +void AudioRendererHost::OnSetAudioStreamVolume(int stream_id, double volume) {
|
| + if (!GetMediaObserver())
|
| + return;
|
| + GetMediaObserver()->OnSetAudioStreamVolume(this, stream_id, volume);
|
| +}
|
| +
|
| +void AudioRendererHost::OnDeleteAudioStream(int stream_id) {
|
| + if (!GetMediaObserver())
|
| + return;
|
| + GetMediaObserver()->OnDeleteAudioStream(this, stream_id);
|
| +}
|
| +
|
| content::MediaObserver* AudioRendererHost::GetMediaObserver() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| if (!media_observer_)
|
|
|