From f7eb0a394522b0c3d6e9c16b54072e0bbafa0957 Mon Sep 17 00:00:00 2001 From: "henrika@chromium.org" Date: Tue, 12 Jul 2011 10:19:51 +0000 Subject: Ensures that AudioMessageFilter now lives on the main render thread. In addition, removes usage of routing ID by utilizing control messages instead of routed messages. BUG=none TESTS=none Review URL: http://codereview.chromium.org/7157001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92138 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/media/media_internals.cc | 26 ++++++++++++-------------- chrome/browser/media/media_internals.h | 17 +++++++---------- 2 files changed, 19 insertions(+), 24 deletions(-) (limited to 'chrome/browser/media') diff --git a/chrome/browser/media/media_internals.cc b/chrome/browser/media/media_internals.cc index 78d66f3..0eecd64 100644 --- a/chrome/browser/media/media_internals.cc +++ b/chrome/browser/media/media_internals.cc @@ -18,28 +18,27 @@ static const char kSendEverythingFunction[] = "onReceiveEverything"; MediaInternals::~MediaInternals() {} -void MediaInternals::OnDeleteAudioStream( - void* host, int32 render_view, int stream_id) { - std::string stream = base::StringPrintf("audio_streams.%p:%d:%d", - host, render_view, stream_id); +void MediaInternals::OnDeleteAudioStream(void* host, int stream_id) { + std::string stream = base::StringPrintf("audio_streams.%p:%d", + host, stream_id); DeleteItem(stream); } void MediaInternals::OnSetAudioStreamPlaying( - void* host, int32 render_view, int stream_id, bool playing) { - UpdateAudioStream(host, render_view, stream_id, + void* host, int stream_id, bool playing) { + UpdateAudioStream(host, stream_id, "playing", Value::CreateBooleanValue(playing)); } void MediaInternals::OnSetAudioStreamStatus( - void* host, int32 render_view, int stream_id, const std::string& status) { - UpdateAudioStream(host, render_view, stream_id, + void* host, int stream_id, const std::string& status) { + UpdateAudioStream(host, stream_id, "status", Value::CreateStringValue(status)); } void MediaInternals::OnSetAudioStreamVolume( - void* host, int32 render_view, int stream_id, double volume) { - UpdateAudioStream(host, render_view, stream_id, + void* host, int stream_id, double volume) { + UpdateAudioStream(host, stream_id, "volume", Value::CreateDoubleValue(volume)); } @@ -59,10 +58,9 @@ MediaInternals::MediaInternals() : observers_(new ObserverListThreadSafe()) {} void MediaInternals::UpdateAudioStream( - void* host, int32 render_view, int stream_id, - const std::string& property, Value* value) { - std::string stream = base::StringPrintf("audio_streams.%p:%d:%d", - host, render_view, stream_id); + void* host, int stream_id, const std::string& property, Value* value) { + std::string stream = base::StringPrintf("audio_streams.%p:%d", + host, stream_id); UpdateItem(kAudioUpdateFunction, stream, property, value); } diff --git a/chrome/browser/media/media_internals.h b/chrome/browser/media/media_internals.h index 8d8e566..1bda944 100644 --- a/chrome/browser/media/media_internals.h +++ b/chrome/browser/media/media_internals.h @@ -19,14 +19,11 @@ class MediaInternals : public MediaObserver { virtual ~MediaInternals(); // MediaObserver implementation. These are called from the IO thread: - virtual void OnDeleteAudioStream(void* host, int32 render_view, - int stream_id); - virtual void OnSetAudioStreamPlaying(void* host, int32 render_view, - int stream_id, bool playing); - virtual void OnSetAudioStreamStatus(void* host, int32 render_view, - int stream_id, const std::string& status); - virtual void OnSetAudioStreamVolume(void* host, int32 render_view, - int stream_id, double volume); + virtual void OnDeleteAudioStream(void* host, int stream_id); + virtual void OnSetAudioStreamPlaying(void* host, int stream_id, bool playing); + virtual void OnSetAudioStreamStatus(void* host, int stream_id, + const std::string& status); + virtual void OnSetAudioStreamVolume(void* host, int stream_id, double volume); // Methods for observers. Called from the observer's own thread: // UIs should add themselves on construction and remove themselves @@ -42,9 +39,9 @@ class MediaInternals : public MediaObserver { MediaInternals(); // Sets |property| of an audio stream to |value| and notifies observers. - // (host, render_view, stream_id) is a unique id for the audio stream. + // (host, stream_id) is a unique id for the audio stream. // |host| will never be dereferenced. - void UpdateAudioStream(void* host, int32 render_view, int stream_id, + void UpdateAudioStream(void* host, int stream_id, const std::string& property, Value* value); // Removes |item| from |data_|. -- cgit v1.1