Index: content/browser/renderer_host/media/audio_renderer_host.cc |
=================================================================== |
--- content/browser/renderer_host/media/audio_renderer_host.cc (revision 179909) |
+++ content/browser/renderer_host/media/audio_renderer_host.cc (working copy) |
@@ -9,10 +9,10 @@ |
#include "base/process.h" |
#include "base/shared_memory.h" |
#include "content/browser/browser_main_loop.h" |
+#include "content/browser/media/media_internals.h" |
#include "content/browser/renderer_host/media/audio_mirroring_manager.h" |
#include "content/browser/renderer_host/media/audio_sync_reader.h" |
#include "content/common/media/audio_messages.h" |
-#include "content/public/browser/media_observer.h" |
#include "media/audio/shared_memory_util.h" |
#include "media/base/audio_bus.h" |
#include "media/base/limits.h" |
@@ -59,11 +59,11 @@ |
int render_process_id, |
media::AudioManager* audio_manager, |
AudioMirroringManager* mirroring_manager, |
- MediaObserver* media_observer) |
+ MediaInternals* media_internals) |
: render_process_id_(render_process_id), |
audio_manager_(audio_manager), |
mirroring_manager_(mirroring_manager), |
- media_observer_(media_observer) { |
+ media_internals_(media_internals) { |
DCHECK(audio_manager_); |
} |
@@ -286,8 +286,8 @@ |
// to the map. |
entry->stream_id = stream_id; |
audio_entries_.insert(std::make_pair(stream_id, entry.release())); |
- if (media_observer_) |
- media_observer_->OnSetAudioStreamStatus(this, stream_id, "created"); |
+ if (media_internals_) |
+ media_internals_->OnSetAudioStreamStatus(this, stream_id, "created"); |
} |
void AudioRendererHost::OnAssociateStreamWithProducer(int stream_id, |
@@ -328,8 +328,8 @@ |
} |
entry->controller->Play(); |
- if (media_observer_) |
- media_observer_->OnSetAudioStreamPlaying(this, stream_id, true); |
+ if (media_internals_) |
+ media_internals_->OnSetAudioStreamPlaying(this, stream_id, true); |
} |
void AudioRendererHost::OnPauseStream(int stream_id) { |
@@ -342,8 +342,8 @@ |
} |
entry->controller->Pause(); |
- if (media_observer_) |
- media_observer_->OnSetAudioStreamPlaying(this, stream_id, false); |
+ if (media_internals_) |
+ media_internals_->OnSetAudioStreamPlaying(this, stream_id, false); |
} |
void AudioRendererHost::OnFlushStream(int stream_id) { |
@@ -356,15 +356,15 @@ |
} |
entry->controller->Flush(); |
- if (media_observer_) |
- media_observer_->OnSetAudioStreamStatus(this, stream_id, "flushed"); |
+ if (media_internals_) |
+ media_internals_->OnSetAudioStreamStatus(this, stream_id, "flushed"); |
} |
void AudioRendererHost::OnCloseStream(int stream_id) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
- if (media_observer_) |
- media_observer_->OnSetAudioStreamStatus(this, stream_id, "closed"); |
+ if (media_internals_) |
+ media_internals_->OnSetAudioStreamStatus(this, stream_id, "closed"); |
AudioEntry* entry = LookupById(stream_id); |
@@ -385,8 +385,8 @@ |
if (volume < 0 || volume > 1.0) |
return; |
entry->controller->SetVolume(volume); |
- if (media_observer_) |
- media_observer_->OnSetAudioStreamVolume(this, stream_id, volume); |
+ if (media_internals_) |
+ media_internals_->OnSetAudioStreamVolume(this, stream_id, volume); |
} |
void AudioRendererHost::SendErrorMessage(int32 stream_id) { |
@@ -427,8 +427,8 @@ |
audio_entries_.erase(entry->stream_id); |
// Notify the media observer. |
- if (media_observer_) |
- media_observer_->OnDeleteAudioStream(this, entry->stream_id); |
+ if (media_internals_) |
+ media_internals_->OnDeleteAudioStream(this, entry->stream_id); |
} |
void AudioRendererHost::DeleteEntryOnError(AudioEntry* entry) { |
@@ -438,8 +438,8 @@ |
// |entry| is destroyed in DeleteEntry(). |
SendErrorMessage(entry->stream_id); |
- if (media_observer_) |
- media_observer_->OnSetAudioStreamStatus(this, entry->stream_id, "error"); |
+ if (media_internals_) |
+ media_internals_->OnSetAudioStreamStatus(this, entry->stream_id, "error"); |
CloseAndDeleteStream(entry); |
} |