diff options
| author | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-15 01:04:00 +0000 |
|---|---|---|
| committer | nfullagar@google.com <nfullagar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-15 01:04:00 +0000 |
| commit | b9a598494478fe8c04b6b7ba1f982ab91be6a521 (patch) | |
| tree | 9b76d2753d28ace9a7efa5957342e8ad5cdadf45 /ppapi/proxy/ppb_audio_proxy.cc | |
| parent | 97d2f1d24de99d6c19bf053fa7d3e61ede99e9c5 (diff) | |
| download | chromium_src-b9a598494478fe8c04b6b7ba1f982ab91be6a521.zip chromium_src-b9a598494478fe8c04b6b7ba1f982ab91be6a521.tar.gz chromium_src-b9a598494478fe8c04b6b7ba1f982ab91be6a521.tar.bz2 | |
Move ppapi audio interface out of dev, but
for this CL, also keep the old dev interface
around temporarily, to avoid tree breakage.
Add sample_rate to RecommendSampleFrameCount() to the
non-dev audio interface. Currently ignored, but useful
information to use when we need to refine RecommendSampleFrameCount()
Review URL: http://codereview.chromium.org/6279003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71527 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_audio_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppb_audio_proxy.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ppapi/proxy/ppb_audio_proxy.cc b/ppapi/proxy/ppb_audio_proxy.cc index e23ac4e..aa8ab92 100644 --- a/ppapi/proxy/ppb_audio_proxy.cc +++ b/ppapi/proxy/ppb_audio_proxy.cc @@ -5,9 +5,9 @@ #include "ppapi/proxy/ppb_audio_proxy.h" #include "base/threading/simple_thread.h" -#include "ppapi/c/dev/ppb_audio_dev.h" -#include "ppapi/c/dev/ppb_audio_trusted_dev.h" #include "ppapi/c/pp_errors.h" +#include "ppapi/c/ppb_audio.h" +#include "ppapi/c/trusted/ppb_audio_trusted.h" #include "ppapi/proxy/interface_id.h" #include "ppapi/proxy/plugin_dispatcher.h" #include "ppapi/proxy/plugin_resource.h" @@ -105,7 +105,7 @@ PP_Bool StopPlayback(PP_Resource audio_id) { return PP_TRUE; } -const PPB_Audio_Dev audio_interface = { +const PPB_Audio audio_interface = { &Create, &IsAudio, &GetCurrentConfiguration, @@ -148,9 +148,9 @@ bool PPB_Audio_Proxy::OnMessageReceived(const IPC::Message& msg) { void PPB_Audio_Proxy::OnMsgCreate(PP_Instance instance_id, PP_Resource config_id, PP_Resource* result) { - const PPB_AudioTrusted_Dev* audio_trusted = - reinterpret_cast<const PPB_AudioTrusted_Dev*>( - dispatcher()->GetLocalInterface(PPB_AUDIO_TRUSTED_DEV_INTERFACE)); + const PPB_AudioTrusted* audio_trusted = + reinterpret_cast<const PPB_AudioTrusted*>( + dispatcher()->GetLocalInterface(PPB_AUDIO_TRUSTED_INTERFACE)); if (!audio_trusted) { *result = 0; return; @@ -231,9 +231,9 @@ int32_t PPB_Audio_Proxy::GetAudioConnectedHandles( base::SharedMemoryHandle* foreign_shared_memory_handle, uint32_t* shared_memory_length) { // Get the trusted audio interface which will give us the handles. - const PPB_AudioTrusted_Dev* audio_trusted = - reinterpret_cast<const PPB_AudioTrusted_Dev*>( - dispatcher()->GetLocalInterface(PPB_AUDIO_TRUSTED_DEV_INTERFACE)); + const PPB_AudioTrusted* audio_trusted = + reinterpret_cast<const PPB_AudioTrusted*>( + dispatcher()->GetLocalInterface(PPB_AUDIO_TRUSTED_INTERFACE)); if (!audio_trusted) return PP_ERROR_NOINTERFACE; |