| Index: ppapi/thunk/ppb_audio_input_api.h
|
| diff --git a/ppapi/thunk/ppb_audio_input_api.h b/ppapi/thunk/ppb_audio_input_api.h
|
| index 38e94ef650ce54d4092a32d0dd75a10d06ea794b..f98bbac7ce5e1864ade90150ece29eb2b55ccf9b 100644
|
| --- a/ppapi/thunk/ppb_audio_input_api.h
|
| +++ b/ppapi/thunk/ppb_audio_input_api.h
|
| @@ -10,6 +10,7 @@
|
|
|
| #include "ppapi/c/dev/ppb_audio_input_dev.h"
|
| #include "ppapi/c/pp_completion_callback.h"
|
| +#include "ppapi/shared_impl/api_callback_type.h"
|
| #include "ppapi/thunk/ppapi_thunk_export.h"
|
|
|
| namespace ppapi {
|
| @@ -22,24 +23,22 @@ class PPAPI_THUNK_EXPORT PPB_AudioInput_API {
|
| public:
|
| virtual ~PPB_AudioInput_API() {}
|
|
|
| - virtual int32_t EnumerateDevices(
|
| - PP_Resource* devices,
|
| - const PP_CompletionCallback& callback) = 0;
|
| + virtual int32_t EnumerateDevices(PP_Resource* devices,
|
| + ApiCallbackType callback) = 0;
|
| virtual int32_t Open(const std::string& device_id,
|
| PP_Resource config,
|
| PPB_AudioInput_Callback audio_input_callback,
|
| void* user_data,
|
| - const PP_CompletionCallback& callback) = 0;
|
| + ApiCallbackType callback) = 0;
|
| virtual PP_Resource GetCurrentConfig() = 0;
|
| virtual PP_Bool StartCapture() = 0;
|
| virtual PP_Bool StopCapture() = 0;
|
| virtual void Close() = 0;
|
|
|
| // Trusted API.
|
| - virtual int32_t OpenTrusted(
|
| - const std::string& device_id,
|
| - PP_Resource config,
|
| - const PP_CompletionCallback& create_callback) = 0;
|
| + virtual int32_t OpenTrusted(const std::string& device_id,
|
| + PP_Resource config,
|
| + ApiCallbackType create_callback) = 0;
|
| virtual int32_t GetSyncSocket(int* sync_socket) = 0;
|
| virtual int32_t GetSharedMemory(int* shm_handle, uint32_t* shm_size) = 0;
|
| virtual const std::vector<DeviceRefData>& GetDeviceRefData() const = 0;
|
|
|