Index: content/renderer/media/audio_message_filter.cc |
diff --git a/content/renderer/media/audio_message_filter.cc b/content/renderer/media/audio_message_filter.cc |
index 81689925d5e4a56626063413ff246a6132d420e6..f134aee112beaebd6cbdb5cefc5db0db8cb5f3a2 100644 |
--- a/content/renderer/media/audio_message_filter.cc |
+++ b/content/renderer/media/audio_message_filter.cc |
@@ -21,19 +21,44 @@ AudioMessageFilter* AudioMessageFilter::Get() { |
AudioMessageFilter::AudioMessageFilter() |
: channel_(NULL) { |
- VLOG(1) << "AudioMessageFilter::AudioMessageFilter()"; |
+ DVLOG(1) << "AudioMessageFilter::AudioMessageFilter()"; |
DCHECK(!filter_); |
filter_ = this; |
} |
-int32 AudioMessageFilter::AddDelegate(Delegate* delegate) { |
+int AudioMessageFilter::AddDelegate(media::AudioDeviceIPCDelegate* delegate) { |
return delegates_.Add(delegate); |
} |
-void AudioMessageFilter::RemoveDelegate(int32 id) { |
+void AudioMessageFilter::RemoveDelegate(int id) { |
delegates_.Remove(id); |
} |
+void AudioMessageFilter::CreateStream(int stream_id, |
+ const media::AudioParameters& params) { |
+ Send(new AudioHostMsg_CreateStream(stream_id, params)); |
+} |
+ |
+void AudioMessageFilter::PlayStream(int stream_id) { |
+ Send(new AudioHostMsg_PlayStream(stream_id)); |
+} |
+ |
+void AudioMessageFilter::PauseStream(int stream_id) { |
+ Send(new AudioHostMsg_PauseStream(stream_id)); |
+} |
+ |
+void AudioMessageFilter::FlushStream(int stream_id) { |
+ Send(new AudioHostMsg_FlushStream(stream_id)); |
+} |
+ |
+void AudioMessageFilter::CloseStream(int stream_id) { |
+ Send(new AudioHostMsg_CloseStream(stream_id)); |
+} |
+ |
+void AudioMessageFilter::SetVolume(int stream_id, double volume) { |
+ Send(new AudioHostMsg_SetVolume(stream_id, volume)); |
+} |
+ |
bool AudioMessageFilter::Send(IPC::Message* message) { |
if (!channel_) { |
delete message; |
@@ -64,7 +89,7 @@ bool AudioMessageFilter::OnMessageReceived(const IPC::Message& message) { |
} |
void AudioMessageFilter::OnFilterAdded(IPC::Channel* channel) { |
- VLOG(1) << "AudioMessageFilter::OnFilterAdded()"; |
+ DVLOG(1) << "AudioMessageFilter::OnFilterAdded()"; |
// Captures the channel for IPC. |
scherkus (not reviewing)
2012/07/23 22:57:51
this comment is useless -- mind removing?
|
channel_ = channel; |
} |
@@ -78,7 +103,7 @@ void AudioMessageFilter::OnChannelClosing() { |
} |
AudioMessageFilter::~AudioMessageFilter() { |
- VLOG(1) << "AudioMessageFilter::~AudioMessageFilter()"; |
+ DVLOG(1) << "AudioMessageFilter::~AudioMessageFilter()"; |
DCHECK(filter_); |
filter_ = NULL; |
} |
@@ -95,7 +120,7 @@ void AudioMessageFilter::OnStreamCreated( |
#if !defined(OS_WIN) |
base::SyncSocket::Handle socket_handle = socket_descriptor.fd; |
#endif |
- Delegate* delegate = delegates_.Lookup(stream_id); |
+ media::AudioDeviceIPCDelegate* delegate = delegates_.Lookup(stream_id); |
if (!delegate) { |
DLOG(WARNING) << "Got audio stream event for a non-existent or removed" |
scherkus (not reviewing)
2012/07/23 22:57:51
I wonder who's passing in bad ids?
if a reference
tommi (sloooow) - chröme
2012/07/24 09:49:44
Upgraded to NOTREACHED.
|
" audio renderer. (stream_id=" << stream_id << ")."; |
@@ -107,8 +132,8 @@ void AudioMessageFilter::OnStreamCreated( |
} |
void AudioMessageFilter::OnStreamStateChanged( |
- int stream_id, AudioStreamState state) { |
- Delegate* delegate = delegates_.Lookup(stream_id); |
+ int stream_id, media::AudioStreamState state) { |
+ media::AudioDeviceIPCDelegate* delegate = delegates_.Lookup(stream_id); |
if (!delegate) { |
DLOG(WARNING) << "Got audio stream event for a non-existent or removed" |
" audio renderer."; |