| 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 c77c84bab3a56c96ae1fd6413802a5413b23caf4..d2252671d30c983064fb40fe29fa707a6c459ffa 100644
|
| --- a/content/browser/renderer_host/media/audio_renderer_host.cc
|
| +++ b/content/browser/renderer_host/media/audio_renderer_host.cc
|
| @@ -291,7 +291,7 @@ void AudioRendererHost::OnCreateStream(
|
| // to the map.
|
| entry->stream_id = stream_id;
|
| audio_entries_.insert(std::make_pair(stream_id, entry.release()));
|
| - media_observer()->OnSetAudioStreamStatus(this, stream_id, "created");
|
| + OnSetAudioStreamStatus(stream_id, "created");
|
| }
|
|
|
| void AudioRendererHost::OnPlayStream(int stream_id) {
|
| @@ -304,7 +304,7 @@ void AudioRendererHost::OnPlayStream(int stream_id) {
|
| }
|
|
|
| entry->controller->Play();
|
| - media_observer()->OnSetAudioStreamPlaying(this, stream_id, true);
|
| + OnSetAudioStreamPlaying(stream_id, true);
|
| }
|
|
|
| void AudioRendererHost::OnPauseStream(int stream_id) {
|
| @@ -317,7 +317,7 @@ void AudioRendererHost::OnPauseStream(int stream_id) {
|
| }
|
|
|
| entry->controller->Pause();
|
| - media_observer()->OnSetAudioStreamPlaying(this, stream_id, false);
|
| + OnSetAudioStreamPlaying(stream_id, false);
|
| }
|
|
|
| void AudioRendererHost::OnFlushStream(int stream_id) {
|
| @@ -330,13 +330,13 @@ void AudioRendererHost::OnFlushStream(int stream_id) {
|
| }
|
|
|
| entry->controller->Flush();
|
| - media_observer()->OnSetAudioStreamStatus(this, stream_id, "flushed");
|
| + OnSetAudioStreamStatus(stream_id, "flushed");
|
| }
|
|
|
| void AudioRendererHost::OnCloseStream(int stream_id) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
|
|
| - media_observer()->OnSetAudioStreamStatus(this, stream_id, "closed");
|
| + OnSetAudioStreamStatus(stream_id, "closed");
|
|
|
| AudioEntry* entry = LookupById(stream_id);
|
|
|
| @@ -357,7 +357,7 @@ void AudioRendererHost::OnSetVolume(int stream_id, double volume) {
|
| if (volume < 0 || volume > 1.0)
|
| return;
|
| entry->controller->SetVolume(volume);
|
| - media_observer()->OnSetAudioStreamVolume(this, stream_id, volume);
|
| + OnSetAudioStreamVolume(stream_id, volume);
|
| }
|
|
|
| void AudioRendererHost::OnGetVolume(int stream_id) {
|
| @@ -429,7 +429,7 @@ void AudioRendererHost::DeleteEntry(AudioEntry* entry) {
|
| audio_entries_.erase(entry->stream_id);
|
|
|
| // Notify the media observer.
|
| - media_observer()->OnDeleteAudioStream(this, entry->stream_id);
|
| + OnDeleteAudioStream(entry->stream_id);
|
| }
|
|
|
| void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) {
|
| @@ -439,7 +439,7 @@ void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) {
|
| // |entry| is destroyed in DeleteEntry().
|
| SendErrorMessage(entry->stream_id);
|
|
|
| - media_observer()->OnSetAudioStreamStatus(this, entry->stream_id, "error");
|
| + OnSetAudioStreamStatus(entry->stream_id, "error");
|
| CloseAndDeleteStream(entry);
|
| }
|
|
|
| @@ -466,6 +466,31 @@ AudioRendererHost::AudioEntry* AudioRendererHost::LookupByController(
|
| return NULL;
|
| }
|
|
|
| +void AudioRendererHost::OnSetAudioStreamPlaying(int stream_id, bool playing) {
|
| + if (!media_observer())
|
| + return;
|
| + media_observer()->OnSetAudioStreamPlaying(this, stream_id, playing);
|
| +}
|
| +
|
| +void AudioRendererHost::OnSetAudioStreamStatus(int stream_id,
|
| + const std::string& status) {
|
| + if (!media_observer())
|
| + return;
|
| + media_observer()->OnSetAudioStreamStatus(this, stream_id, status);
|
| +}
|
| +
|
| +void AudioRendererHost::OnSetAudioStreamVolume(int stream_id, double volume) {
|
| + if (!media_observer())
|
| + return;
|
| + media_observer()->OnSetAudioStreamVolume(this, stream_id, volume);
|
| +}
|
| +
|
| +void AudioRendererHost::OnDeleteAudioStream(int stream_id) {
|
| + if (!media_observer())
|
| + return;
|
| + media_observer()->OnDeleteAudioStream(this, stream_id);
|
| +}
|
| +
|
| MediaObserver* AudioRendererHost::media_observer() {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| if (!media_observer_)
|
|
|