Index: content/renderer/pepper/pepper_platform_audio_output_impl.cc |
diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.cc b/content/renderer/pepper/pepper_platform_audio_output_impl.cc |
index d196102106fd355a9391cc4c606caff21697c479..2bc7a1f56e151b25247147d89e5c720f8fd17ebc 100644 |
--- a/content/renderer/pepper/pepper_platform_audio_output_impl.cc |
+++ b/content/renderer/pepper/pepper_platform_audio_output_impl.cc |
@@ -20,11 +20,12 @@ namespace content { |
// static |
PepperPlatformAudioOutputImpl* PepperPlatformAudioOutputImpl::Create( |
+ int render_view_id, |
int sample_rate, |
int frames_per_buffer, |
webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client) { |
scoped_refptr<PepperPlatformAudioOutputImpl> audio_output( |
- new PepperPlatformAudioOutputImpl()); |
+ new PepperPlatformAudioOutputImpl(render_view_id)); |
if (audio_output->Initialize(sample_rate, frames_per_buffer, client)) { |
// Balanced by Release invoked in |
// PepperPlatformAudioOutputImpl::ShutDownOnIOThread(). |
@@ -94,7 +95,7 @@ void PepperPlatformAudioOutputImpl::OnStreamCreated( |
} |
void PepperPlatformAudioOutputImpl::OnIPCClosed() { |
- ipc_ = NULL; |
+ ipc_.reset(); |
} |
PepperPlatformAudioOutputImpl::~PepperPlatformAudioOutputImpl() { |
@@ -104,11 +105,12 @@ PepperPlatformAudioOutputImpl::~PepperPlatformAudioOutputImpl() { |
DCHECK(!client_); |
} |
-PepperPlatformAudioOutputImpl::PepperPlatformAudioOutputImpl() |
+PepperPlatformAudioOutputImpl::PepperPlatformAudioOutputImpl(int render_view_id) |
: client_(NULL), |
stream_id_(0), |
main_message_loop_proxy_(base::MessageLoopProxy::current()) { |
- ipc_ = RenderThreadImpl::current()->audio_message_filter(); |
+ ipc_ = RenderThreadImpl::current()->audio_message_filter()-> |
+ CreateAudioOutputIPC(render_view_id); |
scherkus (not reviewing)
2012/10/18 05:17:35
fix indent
miu
2012/10/18 05:28:18
Done.
|
} |
bool PepperPlatformAudioOutputImpl::Initialize( |