| Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| index b1cbbd84558bac07bd39f16cff3fbfcc42fba1e3..e7f3c387e677c378074488b7d9133e1907d4c839 100644
|
| --- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| +++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c
|
| @@ -42,8 +42,8 @@
|
| #include "ppapi/c/dev/ppp_zoom_dev.h"
|
| #include "ppapi/c/extensions/dev/ppb_ext_socket_dev.h"
|
| #include "ppapi/c/ppb_audio.h"
|
| +#include "ppapi/c/ppb_audio_buffer.h"
|
| #include "ppapi/c/ppb_audio_config.h"
|
| -#include "ppapi/c/ppb_audio_frame.h"
|
| #include "ppapi/c/ppb_console.h"
|
| #include "ppapi/c/ppb_core.h"
|
| #include "ppapi/c/ppb_file_io.h"
|
| @@ -247,12 +247,12 @@ static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Ext_Socket_Dev_0_2;
|
|
|
| /* Not generating wrapper methods for PPB_Audio_1_1 */
|
|
|
| +/* Not generating wrapper methods for PPB_AudioBuffer_0_1 */
|
| +
|
| /* Not generating wrapper methods for PPB_AudioConfig_1_0 */
|
|
|
| /* Not generating wrapper methods for PPB_AudioConfig_1_1 */
|
|
|
| -/* Not generating wrapper methods for PPB_AudioFrame_0_1 */
|
| -
|
| /* Begin wrapper methods for PPB_Console_1_0 */
|
|
|
| static void Pnacl_M25_PPB_Console_Log(PP_Instance instance, PP_LogLevel level, struct PP_Var* value) {
|
| @@ -1060,14 +1060,14 @@ static PP_Bool Pnacl_M34_PPB_MediaStreamAudioTrack_HasEnded(PP_Resource audio_tr
|
| return iface->HasEnded(audio_track);
|
| }
|
|
|
| -static int32_t Pnacl_M34_PPB_MediaStreamAudioTrack_GetFrame(PP_Resource audio_track, PP_Resource* frame, struct PP_CompletionCallback* callback) {
|
| +static int32_t Pnacl_M34_PPB_MediaStreamAudioTrack_GetBuffer(PP_Resource audio_track, PP_Resource* buffer, struct PP_CompletionCallback* callback) {
|
| const struct PPB_MediaStreamAudioTrack_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1.real_iface;
|
| - return iface->GetFrame(audio_track, frame, *callback);
|
| + return iface->GetBuffer(audio_track, buffer, *callback);
|
| }
|
|
|
| -static int32_t Pnacl_M34_PPB_MediaStreamAudioTrack_RecycleFrame(PP_Resource audio_track, PP_Resource frame) {
|
| +static int32_t Pnacl_M34_PPB_MediaStreamAudioTrack_RecycleBuffer(PP_Resource audio_track, PP_Resource buffer) {
|
| const struct PPB_MediaStreamAudioTrack_0_1 *iface = Pnacl_WrapperInfo_PPB_MediaStreamAudioTrack_0_1.real_iface;
|
| - return iface->RecycleFrame(audio_track, frame);
|
| + return iface->RecycleBuffer(audio_track, buffer);
|
| }
|
|
|
| static void Pnacl_M34_PPB_MediaStreamAudioTrack_Close(PP_Resource audio_track) {
|
| @@ -4182,12 +4182,12 @@ static int32_t Pnacl_M29_PPB_Ext_Socket_Dev_GetJoinedGroups(PP_Instance instance
|
|
|
| /* Not generating wrapper interface for PPB_Audio_1_1 */
|
|
|
| +/* Not generating wrapper interface for PPB_AudioBuffer_0_1 */
|
| +
|
| /* Not generating wrapper interface for PPB_AudioConfig_1_0 */
|
|
|
| /* Not generating wrapper interface for PPB_AudioConfig_1_1 */
|
|
|
| -/* Not generating wrapper interface for PPB_AudioFrame_0_1 */
|
| -
|
| static struct PPB_Console_1_0 Pnacl_Wrappers_PPB_Console_1_0 = {
|
| .Log = (void (*)(PP_Instance instance, PP_LogLevel level, struct PP_Var value))&Pnacl_M25_PPB_Console_Log,
|
| .LogWithSource = (void (*)(PP_Instance instance, PP_LogLevel level, struct PP_Var source, struct PP_Var value))&Pnacl_M25_PPB_Console_LogWithSource
|
| @@ -4402,8 +4402,8 @@ static struct PPB_MediaStreamAudioTrack_0_1 Pnacl_Wrappers_PPB_MediaStreamAudioT
|
| .GetAttrib = (int32_t (*)(PP_Resource audio_track, PP_MediaStreamAudioTrack_Attrib attrib, int32_t* value))&Pnacl_M34_PPB_MediaStreamAudioTrack_GetAttrib,
|
| .GetId = (struct PP_Var (*)(PP_Resource audio_track))&Pnacl_M34_PPB_MediaStreamAudioTrack_GetId,
|
| .HasEnded = (PP_Bool (*)(PP_Resource audio_track))&Pnacl_M34_PPB_MediaStreamAudioTrack_HasEnded,
|
| - .GetFrame = (int32_t (*)(PP_Resource audio_track, PP_Resource* frame, struct PP_CompletionCallback callback))&Pnacl_M34_PPB_MediaStreamAudioTrack_GetFrame,
|
| - .RecycleFrame = (int32_t (*)(PP_Resource audio_track, PP_Resource frame))&Pnacl_M34_PPB_MediaStreamAudioTrack_RecycleFrame,
|
| + .GetBuffer = (int32_t (*)(PP_Resource audio_track, PP_Resource* buffer, struct PP_CompletionCallback callback))&Pnacl_M34_PPB_MediaStreamAudioTrack_GetBuffer,
|
| + .RecycleBuffer = (int32_t (*)(PP_Resource audio_track, PP_Resource buffer))&Pnacl_M34_PPB_MediaStreamAudioTrack_RecycleBuffer,
|
| .Close = (void (*)(PP_Resource audio_track))&Pnacl_M34_PPB_MediaStreamAudioTrack_Close
|
| };
|
|
|
|
|