mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update: modify surface frame marker callback

Browse Source
This commit is contained in:
Marc-André Moreau 2011-11-25 11:30:15 -05:00
parent 7371d203cb
commit af6e914cf3
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/X11/xf_gdi.c
View File

@ -613,7 +613,7 @@ void xf_gdi_mem3blt(rdpContext* context, MEM3BLT_ORDER* mem3blt)
}
void xf_gdi_surface_frame_marker(rdpContext* context, uint16 frame_action, uint32 frame_id)
void xf_gdi_surface_frame_marker(rdpContext* context, SURFACE_FRAME_MARKER* surface_frame_marker)
{
}

10
include/freerdp/update.h
View File

@ -113,6 +113,13 @@ struct _SURFACE_BITS_COMMAND
};
typedef struct _SURFACE_BITS_COMMAND SURFACE_BITS_COMMAND;
struct _SURFACE_FRAME_MARKER
{
uint32 frameAction;
uint32 frameId;
};
typedef struct _SURFACE_FRAME_MARKER SURFACE_FRAME_MARKER;
/* Update Interface */
typedef void (*pBeginPaint)(rdpContext* context);
@ -130,7 +137,7 @@ typedef void (*pSuppressOutput)(rdpContext* context, uint8 allow, RECTANGLE_16*
typedef void (*pSurfaceCommand)(rdpContext* context, STREAM* s);
typedef void (*pSurfaceBits)(rdpContext* context, SURFACE_BITS_COMMAND* surface_bits_command);
typedef void (*pSurfaceFrameMarker)(rdpContext* context, uint16 frameAction, uint32 frameId);
typedef void (*pSurfaceFrameMarker)(rdpContext* context, SURFACE_FRAME_MARKER* surface_frame_marker);
struct rdp_update
{
@ -174,6 +181,7 @@ struct rdp_update
PLAY_SOUND_UPDATE play_sound;
SURFACE_BITS_COMMAND surface_bits_command;
SURFACE_FRAME_MARKER surface_frame_marker;
};
#endif /* __UPDATE_API_H */

9
libfreerdp-core/surface.c
View File

@ -48,13 +48,12 @@ static int update_recv_surfcmd_surface_bits(rdpUpdate* update, STREAM* s)
static int update_recv_surfcmd_frame_marker(rdpUpdate* update, STREAM* s)
{
uint16 frameAction;
uint32 frameId;
SURFACE_FRAME_MARKER* marker = &update->surface_frame_marker;
stream_read_uint16(s, frameAction);
stream_read_uint32(s, frameId);
stream_read_uint16(s, marker->frameAction);
stream_read_uint32(s, marker->frameId);
IFCALL(update->SurfaceFrameMarker, update->context, frameAction, frameId);
IFCALL(update->SurfaceFrameMarker, update->context, marker);
return 6;
}