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

libfreerdp-utils/event: rename event_callback to on_event_free_callback.

Browse Source
This commit is contained in:
Vic Lee 2011-07-11 23:11:03 +08:00
parent 3f8c2176a3
commit 55d6abb221
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/freerdp/types.h
View File

@ -113,7 +113,7 @@ FRDP_BRUSH;
typedef struct _FRDP_PLUGIN_DATA typedef struct _FRDP_PLUGIN_DATA
{ {
uint16 size; uint16 size;
void * data[4]; void* data[4];
} }
FRDP_PLUGIN_DATA; FRDP_PLUGIN_DATA;
@ -128,19 +128,19 @@ FRDP_RECT;
typedef struct _FRDP_EVENT FRDP_EVENT; typedef struct _FRDP_EVENT FRDP_EVENT;
typedef void (*FRDP_EVENT_CALLBACK) (FRDP_EVENT * event); typedef void (*FRDP_EVENT_CALLBACK) (FRDP_EVENT* event);
struct _FRDP_EVENT struct _FRDP_EVENT
{ {
uint16 event_type; uint16 event_type;
FRDP_EVENT_CALLBACK event_callback; FRDP_EVENT_CALLBACK on_event_free_callback;
void * user_data; void* user_data;
}; };
struct _FRDP_VIDEO_FRAME_EVENT struct _FRDP_VIDEO_FRAME_EVENT
{ {
FRDP_EVENT event; FRDP_EVENT event;
uint8 * frame_data; uint8* frame_data;
uint32 frame_size; uint32 frame_size;
uint32 frame_pixfmt; uint32 frame_pixfmt;
sint16 frame_width; sint16 frame_width;
@ -150,7 +150,7 @@ struct _FRDP_VIDEO_FRAME_EVENT
sint16 width; sint16 width;
sint16 height; sint16 height;
uint16 num_visible_rects; uint16 num_visible_rects;
FRDP_RECT * visible_rects; FRDP_RECT* visible_rects;
}; };
typedef struct _FRDP_VIDEO_FRAME_EVENT FRDP_VIDEO_FRAME_EVENT; typedef struct _FRDP_VIDEO_FRAME_EVENT FRDP_VIDEO_FRAME_EVENT;

2
include/freerdp/utils/event.h
View File

@ -23,7 +23,7 @@
#include <freerdp/types.h> #include <freerdp/types.h>
#include <freerdp/constants.h> #include <freerdp/constants.h>
FRDP_EVENT* freerdp_event_new(uint32 event_type, FRDP_EVENT_CALLBACK callback, void* user_data); FRDP_EVENT* freerdp_event_new(uint32 event_type, FRDP_EVENT_CALLBACK on_event_free_callback, void* user_data);
void freerdp_event_free(FRDP_EVENT* event); void freerdp_event_free(FRDP_EVENT* event);
#endif #endif

8
libfreerdp-utils/event.c
View File

@ -22,7 +22,7 @@
#include <string.h> #include <string.h>
#include <freerdp/utils/event.h> #include <freerdp/utils/event.h>
FRDP_EVENT* freerdp_event_new(uint32 event_type, FRDP_EVENT_CALLBACK callback, void* user_data) FRDP_EVENT* freerdp_event_new(uint32 event_type, FRDP_EVENT_CALLBACK on_event_free_callback, void* user_data)
{ {
FRDP_EVENT* event = NULL; FRDP_EVENT* event = NULL;
@ -44,7 +44,7 @@ FRDP_EVENT* freerdp_event_new(uint32 event_type, FRDP_EVENT_CALLBACK callback, v
if (event != NULL) if (event != NULL)
{ {
event->event_type = event_type; event->event_type = event_type;
event->event_callback = callback; event->on_event_free_callback = on_event_free_callback;
event->user_data = user_data; event->user_data = user_data;
} }
@ -55,8 +55,8 @@ void freerdp_event_free(FRDP_EVENT* event)
{ {
if (event != NULL) if (event != NULL)
{ {
if (event->event_callback != NULL) if (event->on_event_free_callback != NULL)
event->event_callback(event); event->on_event_free_callback(event);
switch (event->event_type) switch (event->event_type)
{ {