Chromium Code Reviews| Index: ppapi/proxy/ppapi_messages.h |
| diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
| index a8ae9b342ef0b3e8c6dd109b46501e024d12c6bb..2928d3e7f153a120ae0c1f9b9bc1e02b0d4f0307 100644 |
| --- a/ppapi/proxy/ppapi_messages.h |
| +++ b/ppapi/proxy/ppapi_messages.h |
| @@ -31,6 +31,7 @@ |
| #include "ppapi/c/pp_resource.h" |
| #include "ppapi/c/pp_size.h" |
| #include "ppapi/c/pp_time.h" |
| +#include "ppapi/c/ppb_audio_config.h" |
| #include "ppapi/c/private/pp_content_decryptor.h" |
| #include "ppapi/c/private/pp_private_font_charset.h" |
| #include "ppapi/c/private/ppb_flash.h" |
| @@ -60,6 +61,7 @@ |
| #define IPC_MESSAGE_START PpapiMsgStart |
| +IPC_ENUM_TRAITS(PP_AudioSampleRate) |
| IPC_ENUM_TRAITS(PP_DeviceType_Dev) |
| IPC_ENUM_TRAITS(PP_DecryptorStreamType) |
| IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_Permission) |
| @@ -399,17 +401,6 @@ IPC_MESSAGE_ROUTED4(PpapiMsg_PPBAudio_NotifyAudioStreamCreated, |
| ppapi::proxy::SerializedHandle /* socket_handle */, |
| ppapi::proxy::SerializedHandle /* handle */) |
| -// PPB_AudioInput_Dev. |
| -IPC_MESSAGE_ROUTED3(PpapiMsg_PPBAudioInput_EnumerateDevicesACK, |
| - ppapi::HostResource /* audio_input */, |
| - int32_t /* result */, |
| - std::vector<ppapi::DeviceRefData> /* devices */) |
| -IPC_MESSAGE_ROUTED4(PpapiMsg_PPBAudioInput_OpenACK, |
| - ppapi::HostResource /* audio_input */, |
| - int32_t /* result_code (will be != PP_OK on failure) */, |
| - ppapi::proxy::SerializedHandle /* socket_handle */, |
| - ppapi::proxy::SerializedHandle /* handle */) |
| - |
| // PPB_FileIO. |
| IPC_MESSAGE_ROUTED2(PpapiMsg_PPBFileIO_GeneralComplete, |
| ppapi::HostResource /* file_io */, |
| @@ -820,23 +811,6 @@ IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBAudio_StartOrStop, |
| ppapi::HostResource /* audio_id */, |
| bool /* play */) |
| -// PPB_AudioInput. |
| -IPC_SYNC_MESSAGE_ROUTED1_1(PpapiHostMsg_PPBAudioInput_Create, |
| - PP_Instance /* instance */, |
| - ppapi::HostResource /* result */) |
| -IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBAudioInput_EnumerateDevices, |
| - ppapi::HostResource /* audio_input */) |
| -IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBAudioInput_Open, |
| - ppapi::HostResource /* audio_input */, |
| - std::string /* device_id */, |
| - int32_t /* sample_rate */, |
| - uint32_t /* sample_frame_count */) |
| -IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBAudioInput_StartOrStop, |
| - ppapi::HostResource /* audio_input */, |
| - bool /* capture */) |
| -IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBAudioInput_Close, |
| - ppapi::HostResource /* audio_input */) |
| - |
| // PPB_Core. |
| IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBCore_AddRefResource, |
| ppapi::HostResource) |
| @@ -1615,7 +1589,6 @@ IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Printing_GetDefaultPrintSettingsReply, |
| PP_PrintSettings_Dev /* print_settings */) |
| // WebSocket ------------------------------------------------------------------ |
| - |
| IPC_MESSAGE_CONTROL0(PpapiHostMsg_WebSocket_Create) |
| // Establishes the connection to a server. This message requires |
| @@ -1695,6 +1668,21 @@ IPC_MESSAGE_CONTROL4(PpapiPluginMsg_WebSocket_ClosedReply, |
| std::string /* reason */) |
| #if !defined(OS_NACL) && !defined(NACL_WIN64) |
| +// Audio input. |
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioInput_Create) |
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioInput_EnumerateDevices) |
| +IPC_MESSAGE_CONTROL1(PpapiPluginMsg_AudioInput_EnumerateDevicesReply, |
| + std::vector<ppapi::DeviceRefData> /* devices */) |
| +IPC_MESSAGE_CONTROL3(PpapiHostMsg_AudioInput_Open, |
| + std::string /* device_id */, |
| + PP_AudioSampleRate /* sample_rate */, |
| + uint32_t /* sample_frame_count */) |
| +// Reply to an Open call. This supplies a socket handle and a shared memory |
| +// handle. Both handles are passed in the ReplyParams struct. |
| +IPC_MESSAGE_CONTROL0(PpapiPluginMsg_AudioInput_OpenReply) |
|
raymes
2012/11/07 00:11:46
In theory you don't even have to define this messa
yzshen1
2012/11/08 18:57:30
Yeah, I think it is good to be explicit. :)
|
| +IPC_MESSAGE_CONTROL1(PpapiHostMsg_AudioInput_StartOrStop, bool /* capture */) |
| +IPC_MESSAGE_CONTROL0(PpapiHostMsg_AudioInput_Close) |
| + |
| // Flash font file. |
| IPC_MESSAGE_CONTROL2(PpapiHostMsg_FlashFontFile_Create, |
| ppapi::proxy::SerializedFontDescription /* description */, |