| Index: webkit/glue/plugins/pepper_audio.h
|
| ===================================================================
|
| --- webkit/glue/plugins/pepper_audio.h (revision 66651)
|
| +++ webkit/glue/plugins/pepper_audio.h (working copy)
|
| @@ -52,8 +52,11 @@
|
| static const PPB_Audio_Dev* GetInterface();
|
| static const PPB_AudioTrusted_Dev* GetTrustedInterface();
|
|
|
| - bool Init(PluginDelegate* plugin_delegate, PP_Resource config_id,
|
| - PPB_Audio_Callback callback, void* user_data);
|
| + bool Init(PluginDelegate* plugin_delegate,
|
| + PP_Instance instance_id,
|
| + PP_Resource config_id,
|
| + PPB_Audio_Callback user_callback, void* user_data,
|
| + PPB_AudioTrusted_Callback created);
|
|
|
| PP_Resource GetCurrentConfiguration() {
|
| return config_->GetReference();
|
| @@ -83,8 +86,11 @@
|
| // AudioConfig used for creating this Audio object.
|
| scoped_refptr<AudioConfig> config_;
|
|
|
| + // Instance id
|
| + PP_Instance pp_instance_;
|
| +
|
| // PluginDelegate audio object that we delegate audio IPC through.
|
| - scoped_ptr<PluginDelegate::PlatformAudio> audio_;
|
| + PluginDelegate::PlatformAudio* audio_;
|
|
|
| // Socket used to notify us when audio is ready to accept new samples. This
|
| // pointer is created in StreamCreated().
|
| @@ -106,6 +112,9 @@
|
|
|
| // User data pointer passed verbatim to the callback function.
|
| void* user_data_;
|
| +
|
| + // Trusted callback invoked from StreamCreated.
|
| + PPB_AudioTrusted_Callback create_callback_;
|
| };
|
|
|
| } // namespace pepper
|
|
|