DeforaOS/GServer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename some constants and functions

Browse Source
This commit is contained in:
Pierre Pronchery 2016-09-09 15:28:44 +02:00
parent 534efb1dba
commit 8266f49427
2 changed files with 237 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

275
include/GServer/video.h
View File

@ -26,159 +26,160 @@
/* Video */ /* Video */
/* types */ /* types */
typedef enum _GServerVideoProto typedef enum _GServerVideoCall
{ {
GSERVER_VIDEO_PROTO_0 = 0, GSERVER_VIDEO_CALL_0 = 0,
GSERVER_VIDEO_PROTO_1d, GSERVER_VIDEO_CALL_1d,
GSERVER_VIDEO_PROTO_1i, GSERVER_VIDEO_CALL_1i,
GSERVER_VIDEO_PROTO_2f, GSERVER_VIDEO_CALL_2f,
GSERVER_VIDEO_PROTO_2i, GSERVER_VIDEO_CALL_2i,
GSERVER_VIDEO_PROTO_3b, GSERVER_VIDEO_CALL_3b,
GSERVER_VIDEO_PROTO_3d, GSERVER_VIDEO_CALL_3d,
GSERVER_VIDEO_PROTO_3f, GSERVER_VIDEO_CALL_3f,
GSERVER_VIDEO_PROTO_3i, GSERVER_VIDEO_CALL_3i,
GSERVER_VIDEO_PROTO_3s, GSERVER_VIDEO_CALL_3s,
GSERVER_VIDEO_PROTO_4b, GSERVER_VIDEO_CALL_4b,
GSERVER_VIDEO_PROTO_4d, GSERVER_VIDEO_CALL_4d,
GSERVER_VIDEO_PROTO_4f, GSERVER_VIDEO_CALL_4f,
GSERVER_VIDEO_PROTO_4i, GSERVER_VIDEO_CALL_4i,
GSERVER_VIDEO_PROTO_4s GSERVER_VIDEO_CALL_4s
} GServerVideoProto; } GServerVideoCall;
typedef enum _GServerVideoProto0 typedef enum _GServerVideoCall0
{ {
GSERVER_VIDEO_PROTO0_glEnd = 0, GSERVER_VIDEO_CALL0_glEnd = 0,
GSERVER_VIDEO_PROTO0_glEndList, GSERVER_VIDEO_CALL0_glEndList,
GSERVER_VIDEO_PROTO0_glFlush, GSERVER_VIDEO_CALL0_glFlush,
GSERVER_VIDEO_PROTO0_glLoadIdentity, GSERVER_VIDEO_CALL0_glLoadIdentity,
GSERVER_VIDEO_PROTO0_SwapBuffers GSERVER_VIDEO_CALL0_SwapBuffers
} GServerVideoProto0; } GServerVideoCall0;
# define GSERVER_VIDEO_PROTO0_LAST GSERVER_VIDEO_PROTO0_SwapBuffers # define GSERVER_VIDEO_CALL0_LAST GSERVER_VIDEO_CALL0_SwapBuffers
# define GSERVER_VIDEO_PROTO0_COUNT (GSERVER_VIDEO_PROTO0_LAST + 1) # define GSERVER_VIDEO_CALL0_COUNT (GSERVER_VIDEO_CALL0_LAST + 1)
typedef enum _GServerVideoProto1d typedef enum _GServerVideoCall1d
{ {
GSERVER_VIDEO_PROTO1d_glClearDepth = 0 GSERVER_VIDEO_CALL1d_glClearDepth = 0
} GServerVideoProto1d; } GServerVideoCall1d;
# define GSERVER_VIDEO_PROTO1d_LAST GSERVER_VIDEO_PROTO1d_glClearDepth # define GSERVER_VIDEO_CALL1d_LAST GSERVER_VIDEO_CALL1d_glClearDepth
# define GSERVER_VIDEO_PROTO1d_COUNT (GSERVER_VIDEO_PROTO1d_LAST + 1) # define GSERVER_VIDEO_CALL1d_COUNT (GSERVER_VIDEO_CALL1d_LAST + 1)
typedef enum _GServerVideoProto1i typedef enum _GServerVideoCall1i
{ {
GSERVER_VIDEO_PROTO1i_glBegin = 0, GSERVER_VIDEO_CALL1i_glBegin = 0,
GSERVER_VIDEO_PROTO1i_glClear, GSERVER_VIDEO_CALL1i_glClear,
GSERVER_VIDEO_PROTO1i_glDepthFunc, GSERVER_VIDEO_CALL1i_glDepthFunc,
GSERVER_VIDEO_PROTO1i_glDisable, GSERVER_VIDEO_CALL1i_glDisable,
GSERVER_VIDEO_PROTO1i_glDisableClientState, GSERVER_VIDEO_CALL1i_glDisableClientState,
GSERVER_VIDEO_PROTO1i_glEnable, GSERVER_VIDEO_CALL1i_glEnable,
GSERVER_VIDEO_PROTO1i_glEnableClientState, GSERVER_VIDEO_CALL1i_glEnableClientState,
GSERVER_VIDEO_PROTO1i_glIsEnabled, GSERVER_VIDEO_CALL1i_glIsEnabled,
GSERVER_VIDEO_PROTO1i_glShadeModel GSERVER_VIDEO_CALL1i_glShadeModel
} GServerVideoProto1i; } GServerVideoCall1i;
# define GSERVER_VIDEO_PROTO1i_LAST GSERVER_VIDEO_PROTO1i_glShadeModel # define GSERVER_VIDEO_CALL1i_LAST GSERVER_VIDEO_CALL1i_glShadeModel
# define GSERVER_VIDEO_PROTO1i_COUNT (GSERVER_VIDEO_PROTO1i_LAST + 1) # define GSERVER_VIDEO_CALL1i_COUNT (GSERVER_VIDEO_CALL1i_LAST + 1)
typedef enum _GServerVideoProto2f typedef enum _GServerVideoCall2f
{ {
GSERVER_VIDEO_PROTO2f_glTexCoord2f = 0 GSERVER_VIDEO_CALL2f_glTexCoord2f = 0
} GServerVideoProto2f; } GServerVideoCall2f;
# define GSERVER_VIDEO_PROTO2f_LAST GSERVER_VIDEO_PROTO2f_glTexCoord2f # define GSERVER_VIDEO_CALL2f_LAST GSERVER_VIDEO_CALL2f_glTexCoord2f
# define GSERVER_VIDEO_PROTO2f_COUNT (GSERVER_VIDEO_PROTO2f_LAST + 1) # define GSERVER_VIDEO_CALL2f_COUNT (GSERVER_VIDEO_CALL2f_LAST + 1)
typedef enum _GServerVideoProto2i typedef enum _GServerVideoCall2i
{ {
GSERVER_VIDEO_PROTO2i_glBindTexture = 0, GSERVER_VIDEO_CALL2i_glBindTexture = 0,
GSERVER_VIDEO_PROTO2i_glColorMaterial, GSERVER_VIDEO_CALL2i_glColorMaterial,
GSERVER_VIDEO_PROTO2i_glHint, GSERVER_VIDEO_CALL2i_glHint,
GSERVER_VIDEO_PROTO2i_glVertex2i GSERVER_VIDEO_CALL2i_glVertex2i
} GServerVideoProto2i; } GServerVideoCall2i;
# define GSERVER_VIDEO_PROTO2i_LAST GSERVER_VIDEO_PROTO2i_glVertex2i # define GSERVER_VIDEO_CALL2i_LAST GSERVER_VIDEO_CALL2i_glVertex2i
# define GSERVER_VIDEO_PROTO2i_COUNT (GSERVER_VIDEO_PROTO1i_LAST + 1) # define GSERVER_VIDEO_CALL2i_COUNT (GSERVER_VIDEO_CALL1i_LAST + 1)
typedef enum _GServerVideoProto3b typedef enum _GServerVideoCall3b
{ {
GSERVER_VIDEO_PROTO3b_glColor3b = 0, GSERVER_VIDEO_CALL3b_glColor3b = 0,
GSERVER_VIDEO_PROTO3b_glColor3ub GSERVER_VIDEO_CALL3b_glColor3ub
} GServerVideoProto3b; } GServerVideoCall3b;
# define GSERVER_VIDEO_PROTO3b_LAST GSERVER_VIDEO_PROTO3b_glColor3ub # define GSERVER_VIDEO_CALL3b_LAST GSERVER_VIDEO_CALL3b_glColor3ub
# define GSERVER_VIDEO_PROTO3b_COUNT (GSERVER_VIDEO_PROTO3b_LAST + 1) # define GSERVER_VIDEO_CALL3b_COUNT (GSERVER_VIDEO_CALL3b_LAST + 1)
typedef enum _GServerVideoProto3d typedef enum _GServerVideoCall3d
{ {
GSERVER_VIDEO_PROTO3d_glColor3d = 0, GSERVER_VIDEO_CALL3d_glColor3d = 0,
GSERVER_VIDEO_PROTO3d_glTranslated GSERVER_VIDEO_CALL3d_glTranslated
} GServerVideoProto3d; } GServerVideoCall3d;
# define GSERVER_VIDEO_PROTO3d_LAST GSERVER_VIDEO_PROTO3d_glTranslated # define GSERVER_VIDEO_CALL3d_LAST GSERVER_VIDEO_CALL3d_glTranslated
# define GSERVER_VIDEO_PROTO3d_COUNT (GSERVER_VIDEO_PROTO3d_LAST + 1) # define GSERVER_VIDEO_CALL3d_COUNT (GSERVER_VIDEO_CALL3d_LAST + 1)
typedef enum _GServerVideoProto3f typedef enum _GServerVideoCall3f
{ {
GSERVER_VIDEO_PROTO3f_glColor3f = 0, GSERVER_VIDEO_CALL3f_glColor3f = 0,
GSERVER_VIDEO_PROTO3f_glNormal3f, GSERVER_VIDEO_CALL3f_glNormal3f,
GSERVER_VIDEO_PROTO3f_glTranslatef, GSERVER_VIDEO_CALL3f_glTranslatef,
GSERVER_VIDEO_PROTO3f_glVertex3f GSERVER_VIDEO_CALL3f_glVertex3f
} GServerVideoProto3f; } GServerVideoCall3f;
# define GSERVER_VIDEO_PROTO3f_LAST GSERVER_VIDEO_PROTO3f_glVertex3f # define GSERVER_VIDEO_CALL3f_LAST GSERVER_VIDEO_CALL3f_glVertex3f
# define GSERVER_VIDEO_PROTO3f_COUNT (GSERVER_VIDEO_PROTO3f_LAST + 1) # define GSERVER_VIDEO_CALL3f_COUNT (GSERVER_VIDEO_CALL3f_LAST + 1)
typedef enum _GServerVideoProto3i typedef enum _GServerVideoCall3i
{ {
GSERVER_VIDEO_PROTO3i_glColor3i = 0, GSERVER_VIDEO_CALL3i_glColor3i = 0,
GSERVER_VIDEO_PROTO3i_glColor3ui, GSERVER_VIDEO_CALL3i_glColor3ui,
GSERVER_VIDEO_PROTO3i_glDrawArrays, GSERVER_VIDEO_CALL3i_glDrawArrays,
GSERVER_VIDEO_PROTO3i_glLighti, GSERVER_VIDEO_CALL3i_glLighti,
GSERVER_VIDEO_PROTO3i_glTexParameteri, GSERVER_VIDEO_CALL3i_glTexParameteri,
GSERVER_VIDEO_PROTO3i_glVertex3i GSERVER_VIDEO_CALL3i_glVertex3i
} GServerVideoProto3i; } GServerVideoCall3i;
# define GSERVER_VIDEO_PROTO3i_LAST GSERVER_VIDEO_PROTO3i_glVertex3i # define GSERVER_VIDEO_CALL3i_LAST GSERVER_VIDEO_CALL3i_glVertex3i
# define GSERVER_VIDEO_PROTO3i_COUNT (GSERVER_VIDEO_PROTO3i_LAST + 1) # define GSERVER_VIDEO_CALL3i_COUNT (GSERVER_VIDEO_CALL3i_LAST + 1)
typedef enum _GServerVideoProto3s typedef enum _GServerVideoCall3s
{ {
GSERVER_VIDEO_PROTO3s_glColor3s = 0 GSERVER_VIDEO_CALL3s_glColor3s = 0,
} GServerVideoProto3s; GSERVER_VIDEO_CALL3s_glColor3us
# define GSERVER_VIDEO_PROTO3s_LAST GSERVER_VIDEO_PROTO3s_glColor3s } GServerVideoCall3s;
# define GSERVER_VIDEO_PROTO3s_COUNT (GSERVER_VIDEO_PROTO3s_LAST + 1) # define GSERVER_VIDEO_CALL3s_LAST GSERVER_VIDEO_CALL3s_glColor3us
# define GSERVER_VIDEO_CALL3s_COUNT (GSERVER_VIDEO_CALL3s_LAST + 1)
typedef enum _GServerVideoProto4b typedef enum _GServerVideoCall4b
{ {
GSERVER_VIDEO_PROTO4b_glColor4b = 0, GSERVER_VIDEO_CALL4b_glColor4b = 0,
GSERVER_VIDEO_PROTO4b_glColor4ub GSERVER_VIDEO_CALL4b_glColor4ub
} GServerVideoProto4b; } GServerVideoCall4b;
# define GSERVER_VIDEO_PROTO4b_LAST GSERVER_VIDEO_PROTO4b_glColor4ub # define GSERVER_VIDEO_CALL4b_LAST GSERVER_VIDEO_CALL4b_glColor4ub
# define GSERVER_VIDEO_PROTO4b_COUNT (GSERVER_VIDEO_PROTO4b_LAST + 1) # define GSERVER_VIDEO_CALL4b_COUNT (GSERVER_VIDEO_CALL4b_LAST + 1)
typedef enum _GServerVideoProto4d typedef enum _GServerVideoCall4d
{ {
GSERVER_VIDEO_PROTO4d_glColor4d = 0 GSERVER_VIDEO_CALL4d_glColor4d = 0
} GServerVideoProto4d; } GServerVideoCall4d;
# define GSERVER_VIDEO_PROTO4d_LAST GSERVER_VIDEO_PROTO4d_glColor4d # define GSERVER_VIDEO_CALL4d_LAST GSERVER_VIDEO_CALL4d_glColor4d
# define GSERVER_VIDEO_PROTO4d_COUNT (GSERVER_VIDEO_PROTO4d_LAST + 1) # define GSERVER_VIDEO_CALL4d_COUNT (GSERVER_VIDEO_CALL4d_LAST + 1)
typedef enum _GServerVideoProto4f typedef enum _GServerVideoCall4f
{ {
GSERVER_VIDEO_PROTO4f_glClearColor = 0, GSERVER_VIDEO_CALL4f_glClearColor = 0,
GSERVER_VIDEO_PROTO4f_glColor4f, GSERVER_VIDEO_CALL4f_glColor4f,
GSERVER_VIDEO_PROTO4f_glRotatef GSERVER_VIDEO_CALL4f_glRotatef
} GServerVideoProto4f; } GServerVideoCall4f;
# define GSERVER_VIDEO_PROTO4f_LAST GSERVER_VIDEO_PROTO4f_glRotatef # define GSERVER_VIDEO_CALL4f_LAST GSERVER_VIDEO_CALL4f_glRotatef
# define GSERVER_VIDEO_PROTO4f_COUNT (GSERVER_VIDEO_PROTO4f_LAST + 1) # define GSERVER_VIDEO_CALL4f_COUNT (GSERVER_VIDEO_CALL4f_LAST + 1)
typedef enum _GServerVideoProto4i typedef enum _GServerVideoCall4i
{ {
GSERVER_VIDEO_PROTO4i_glColor4i = 0, GSERVER_VIDEO_CALL4i_glColor4i = 0,
GSERVER_VIDEO_PROTO4i_glColor4ui GSERVER_VIDEO_CALL4i_glColor4ui
} GServerVideoProto4i; } GServerVideoCall4i;
# define GSERVER_VIDEO_PROTO4i_LAST GSERVER_VIDEO_PROTO4i_glColor4ui # define GSERVER_VIDEO_CALL4i_LAST GSERVER_VIDEO_CALL4i_glColor4ui
# define GSERVER_VIDEO_PROTO4i_COUNT (GSERVER_VIDEO_PROTO4i_LAST + 1) # define GSERVER_VIDEO_CALL4i_COUNT (GSERVER_VIDEO_CALL4i_LAST + 1)
typedef enum _GServerVideoProto4s typedef enum _GServerVideoCall4s
{ {
GSERVER_VIDEO_PROTO4s_glColor4s = 0, GSERVER_VIDEO_CALL4s_glColor4s = 0,
GSERVER_VIDEO_PROTO4s_glColor4us GSERVER_VIDEO_CALL4s_glColor4us
} GServerVideoProto4s; } GServerVideoCall4s;
# define GSERVER_VIDEO_PROTO4s_LAST GSERVER_VIDEO_PROTO4s_glColor4us # define GSERVER_VIDEO_CALL4s_LAST GSERVER_VIDEO_CALL4s_glColor4us
# define GSERVER_VIDEO_PROTO4s_COUNT (GSERVER_VIDEO_PROTO4s_LAST + 1) # define GSERVER_VIDEO_CALL4s_COUNT (GSERVER_VIDEO_CALL4s_LAST + 1)
/* GServerVideoPlugin */ /* GServerVideoPlugin */
typedef struct _GServerVideoPlugin GServerVideoPlugin; typedef struct _GServerVideoPlugin GServerVideoPlugin;
@ -199,34 +200,34 @@ struct _GServerVideoPlugin
char const * name; char const * name;
int (*init)(GServerVideoPlugin * plugin); int (*init)(GServerVideoPlugin * plugin);
void (*destroy)(GServerVideoPlugin * plugin); void (*destroy)(GServerVideoPlugin * plugin);
void (*proto0)(GServerVideoPlugin * plugin, GServerVideoProto0 func); void (*call0)(GServerVideoPlugin * plugin, GServerVideoCall0 func);
void (*proto1d)(GServerVideoPlugin * plugin, GServerVideoProto1d func, void (*call1d)(GServerVideoPlugin * plugin, GServerVideoCall1d func,
double x); double x);
void (*proto1i)(GServerVideoPlugin * plugin, GServerVideoProto1i func, void (*call1i)(GServerVideoPlugin * plugin, GServerVideoCall1i func,
uint32_t x); uint32_t x);
void (*proto2f)(GServerVideoPlugin * plugin, GServerVideoProto2f func, void (*call2f)(GServerVideoPlugin * plugin, GServerVideoCall2f func,
float x, float y); float x, float y);
void (*proto2i)(GServerVideoPlugin * plugin, GServerVideoProto2i func, void (*call2i)(GServerVideoPlugin * plugin, GServerVideoCall2i func,
uint32_t x, uint32_t y); uint32_t x, uint32_t y);
void (*proto3b)(GServerVideoPlugin * plugin, GServerVideoProto3b func, void (*call3b)(GServerVideoPlugin * plugin, GServerVideoCall3b func,
uint8_t x, uint8_t y, uint8_t z); uint8_t x, uint8_t y, uint8_t z);
void (*proto3d)(GServerVideoPlugin * plugin, GServerVideoProto3d func, void (*call3d)(GServerVideoPlugin * plugin, GServerVideoCall3d func,
double x, double y, double z); double x, double y, double z);
void (*proto3f)(GServerVideoPlugin * plugin, GServerVideoProto3f func, void (*call3f)(GServerVideoPlugin * plugin, GServerVideoCall3f func,
float x, float y, float z); float x, float y, float z);
void (*proto3i)(GServerVideoPlugin * plugin, GServerVideoProto3i func, void (*call3i)(GServerVideoPlugin * plugin, GServerVideoCall3i func,
uint32_t x, uint32_t y, uint32_t z); uint32_t x, uint32_t y, uint32_t z);
void (*proto3s)(GServerVideoPlugin * plugin, GServerVideoProto3s func, void (*call3s)(GServerVideoPlugin * plugin, GServerVideoCall3s func,
uint16_t x, uint16_t y, uint16_t z); uint16_t x, uint16_t y, uint16_t z);
void (*proto4b)(GServerVideoPlugin * plugin, GServerVideoProto4b func, void (*call4b)(GServerVideoPlugin * plugin, GServerVideoCall4b func,
uint8_t x, uint8_t y, uint8_t z, uint8_t t); uint8_t x, uint8_t y, uint8_t z, uint8_t t);
void (*proto4d)(GServerVideoPlugin * plugin, GServerVideoProto4d func, void (*call4d)(GServerVideoPlugin * plugin, GServerVideoCall4d func,
double x, double y, double z, double t); double x, double y, double z, double t);
void (*proto4f)(GServerVideoPlugin * plugin, GServerVideoProto4f func, void (*call4f)(GServerVideoPlugin * plugin, GServerVideoCall4f func,
float x, float y, float z, float t); float x, float y, float z, float t);
void (*proto4i)(GServerVideoPlugin * plugin, GServerVideoProto4i func, void (*call4i)(GServerVideoPlugin * plugin, GServerVideoCall4i func,
uint32_t x, uint32_t y, uint32_t z, uint32_t t); uint32_t x, uint32_t y, uint32_t z, uint32_t t);
void (*proto4s)(GServerVideoPlugin * plugin, GServerVideoProto4s func, void (*call4s)(GServerVideoPlugin * plugin, GServerVideoCall4s func,
uint16_t x, uint16_t y, uint16_t z, uint16_t t); uint16_t x, uint16_t y, uint16_t z, uint16_t t);
void * priv; void * priv;
}; };

198
src/gserver.c
View File

@ -104,7 +104,7 @@ struct _App
struct _GServerCall struct _GServerCall
{ {
GServerVideoProto type; GServerVideoCall type;
unsigned int func; unsigned int func;
union union
{ {
@ -212,40 +212,40 @@ static GServerClient * _gserver_get_client(GServer * gserver, void * id);
/* queue */ /* queue */
static GServerCall * _gserver_queue(GServer * gserver, AppServerClient * asc, static GServerCall * _gserver_queue(GServer * gserver, AppServerClient * asc,
GServerVideoProto type, unsigned int func); GServerVideoCall type, unsigned int func);
static int _gserver_queue0(GServer * gserver, AppServerClient * asc, static int _gserver_queue0(GServer * gserver, AppServerClient * asc,
GServerVideoProto0 func); GServerVideoCall0 func);
static int _gserver_queue1d(GServer * gserver, AppServerClient * asc, static int _gserver_queue1d(GServer * gserver, AppServerClient * asc,
GServerVideoProto1d func, double x); GServerVideoCall1d func, double x);
static int _gserver_queue1i(GServer * gserver, AppServerClient * asc, static int _gserver_queue1i(GServer * gserver, AppServerClient * asc,
GServerVideoProto1i func, uint32_t x); GServerVideoCall1i func, uint32_t x);
static int _gserver_queue2f(GServer * gserver, AppServerClient * asc, static int _gserver_queue2f(GServer * gserver, AppServerClient * asc,
GServerVideoProto2f func, float x, float y); GServerVideoCall2f func, float x, float y);
static int _gserver_queue2i(GServer * gserver, AppServerClient * asc, static int _gserver_queue2i(GServer * gserver, AppServerClient * asc,
GServerVideoProto2i func, uint32_t x, uint32_t y); GServerVideoCall2i func, uint32_t x, uint32_t y);
static int _gserver_queue3b(GServer * gserver, AppServerClient * asc, static int _gserver_queue3b(GServer * gserver, AppServerClient * asc,
GServerVideoProto3b func, uint8_t x, uint8_t y, uint8_t z); GServerVideoCall3b func, uint8_t x, uint8_t y, uint8_t z);
static int _gserver_queue3d(GServer * gserver, AppServerClient * asc, static int _gserver_queue3d(GServer * gserver, AppServerClient * asc,
GServerVideoProto3d func, double x, double y, double z); GServerVideoCall3d func, double x, double y, double z);
static int _gserver_queue3f(GServer * gserver, AppServerClient * asc, static int _gserver_queue3f(GServer * gserver, AppServerClient * asc,
GServerVideoProto3f func, float x, float y, float z); GServerVideoCall3f func, float x, float y, float z);
static int _gserver_queue3i(GServer * gserver, AppServerClient * asc, static int _gserver_queue3i(GServer * gserver, AppServerClient * asc,
GServerVideoProto3i func, uint32_t x, uint32_t y, uint32_t z); GServerVideoCall3i func, uint32_t x, uint32_t y, uint32_t z);
static int _gserver_queue3s(GServer * gserver, AppServerClient * asc, static int _gserver_queue3s(GServer * gserver, AppServerClient * asc,
GServerVideoProto3s func, uint16_t x, uint16_t y, uint16_t z); GServerVideoCall3s func, uint16_t x, uint16_t y, uint16_t z);
static int _gserver_queue4b(GServer * gserver, AppServerClient * asc, static int _gserver_queue4b(GServer * gserver, AppServerClient * asc,
GServerVideoProto4b func, uint8_t x, uint8_t y, uint8_t z, GServerVideoCall4b func, uint8_t x, uint8_t y, uint8_t z,
uint8_t t); uint8_t t);
static int _gserver_queue4d(GServer * gserver, AppServerClient * asc, static int _gserver_queue4d(GServer * gserver, AppServerClient * asc,
GServerVideoProto4d func, double x, double y, double z, GServerVideoCall4d func, double x, double y, double z,
double t); double t);
static int _gserver_queue4f(GServer * gserver, AppServerClient * asc, static int _gserver_queue4f(GServer * gserver, AppServerClient * asc,
GServerVideoProto4f func, float x, float y, float z, float t); GServerVideoCall4f func, float x, float y, float z, float t);
static int _gserver_queue4i(GServer * gserver, AppServerClient * asc, static int _gserver_queue4i(GServer * gserver, AppServerClient * asc,
GServerVideoProto4i func, uint32_t x, uint32_t y, uint32_t z, GServerVideoCall4i func, uint32_t x, uint32_t y, uint32_t z,
uint32_t t); uint32_t t);
static int _gserver_queue4s(GServer * gserver, AppServerClient * asc, static int _gserver_queue4s(GServer * gserver, AppServerClient * asc,
GServerVideoProto4s func, uint16_t x, uint16_t y, uint16_t z, GServerVideoCall4s func, uint16_t x, uint16_t y, uint16_t z,
uint16_t t); uint16_t t);
@ -391,15 +391,15 @@ void gserver_refresh(GServer * gserver)
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__); fprintf(stderr, "DEBUG: %s()\n", __func__);
#endif #endif
gserver->video_plugin->proto1i(gserver->video_plugin, gserver->video_plugin->call1i(gserver->video_plugin,
GSERVER_VIDEO_PROTO1i_glClear, GSERVER_VIDEO_CALL1i_glClear,
GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
gserver->video_plugin->proto0(gserver->video_plugin, gserver->video_plugin->call0(gserver->video_plugin,
GSERVER_VIDEO_PROTO0_glLoadIdentity); GSERVER_VIDEO_CALL0_glLoadIdentity);
for(i = 0; i < gserver->clients_cnt; i++) for(i = 0; i < gserver->clients_cnt; i++)
_gserver_client_calls(gserver, &gserver->clients[i]); _gserver_client_calls(gserver, &gserver->clients[i]);
gserver->video_plugin->proto0(gserver->video_plugin, gserver->video_plugin->call0(gserver->video_plugin,
GSERVER_VIDEO_PROTO0_SwapBuffers); GSERVER_VIDEO_CALL0_SwapBuffers);
} }
@ -408,91 +408,91 @@ void gserver_refresh(GServer * gserver)
type GServer_ ## func (GServer * gserver, AppServerClient * asc) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc) \
{ \ { \
DEBUG_INTERFACE(); \ DEBUG_INTERFACE(); \
_gserver_queue0(gserver, asc, GSERVER_VIDEO_PROTO0_ ## func); \ _gserver_queue0(gserver, asc, GSERVER_VIDEO_CALL0_ ## func); \
} }
#define GSERVER_PROTO1d(type, func) \ #define GSERVER_PROTO1d(type, func) \
type GServer_ ## func(GServer * gserver, AppServerClient * asc, double x) \ type GServer_ ## func(GServer * gserver, AppServerClient * asc, double x) \
{ \ { \
DEBUG_INTERFACE(); \ DEBUG_INTERFACE(); \
_gserver_queue1d(gserver, asc, GSERVER_VIDEO_PROTO1d_ ## func, x); \ _gserver_queue1d(gserver, asc, GSERVER_VIDEO_CALL1d_ ## func, x); \
} }
#define GSERVER_PROTO1i(type, func, type1) \ #define GSERVER_PROTO1i(type, func, type1) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x) \
{ \ { \
DEBUG_INTERFACE1i(x); \ DEBUG_INTERFACE1i(x); \
_gserver_queue1i(gserver, asc, GSERVER_VIDEO_PROTO1i_ ## func, (uint32_t)x); \ _gserver_queue1i(gserver, asc, GSERVER_VIDEO_CALL1i_ ## func, (uint32_t)x); \
} }
#define GSERVER_PROTO2f(type, func) \ #define GSERVER_PROTO2f(type, func) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, float x, float y) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, float x, float y) \
{ \ { \
DEBUG_INTERFACE2f(x, y); \ DEBUG_INTERFACE2f(x, y); \
_gserver_queue2f(gserver, asc, GSERVER_VIDEO_PROTO2f_ ## func, x, y); \ _gserver_queue2f(gserver, asc, GSERVER_VIDEO_CALL2f_ ## func, x, y); \
} }
#define GSERVER_PROTO2i(type, func, type1, type2) \ #define GSERVER_PROTO2i(type, func, type1, type2) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y) \
{ \ { \
DEBUG_INTERFACE2i(x, y); \ DEBUG_INTERFACE2i(x, y); \
_gserver_queue2i(gserver, asc, GSERVER_VIDEO_PROTO2i_ ## func, (uint32_t)x, (uint32_t)y); \ _gserver_queue2i(gserver, asc, GSERVER_VIDEO_CALL2i_ ## func, (uint32_t)x, (uint32_t)y); \
} }
#define GSERVER_PROTO3b(type, func, type1, type2, type3) \ #define GSERVER_PROTO3b(type, func, type1, type2, type3) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z) \
{ \ { \
DEBUG_INTERFACE3b(x, y, z); \ DEBUG_INTERFACE3b(x, y, z); \
_gserver_queue3b(gserver, asc, GSERVER_VIDEO_PROTO3b_ ## func, (uint8_t)x, (uint8_t)y, (uint8_t)z); \ _gserver_queue3b(gserver, asc, GSERVER_VIDEO_CALL3b_ ## func, (uint8_t)x, (uint8_t)y, (uint8_t)z); \
} }
#define GSERVER_PROTO3d(type, func) \ #define GSERVER_PROTO3d(type, func) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, double x, double y, double z) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, double x, double y, double z) \
{ \ { \
DEBUG_INTERFACE3d(x, y, z); \ DEBUG_INTERFACE3d(x, y, z); \
_gserver_queue3d(gserver, asc, GSERVER_VIDEO_PROTO3d_ ## func, x, y, z); \ _gserver_queue3d(gserver, asc, GSERVER_VIDEO_CALL3d_ ## func, x, y, z); \
} }
#define GSERVER_PROTO3f(type, func) \ #define GSERVER_PROTO3f(type, func) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, float x, float y, float z) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, float x, float y, float z) \
{ \ { \
DEBUG_INTERFACE3f(x, y, z); \ DEBUG_INTERFACE3f(x, y, z); \
_gserver_queue3f(gserver, asc, GSERVER_VIDEO_PROTO3f_ ## func, x, y, z); \ _gserver_queue3f(gserver, asc, GSERVER_VIDEO_CALL3f_ ## func, x, y, z); \
} }
#define GSERVER_PROTO3i(type, func, type1, type2, type3) \ #define GSERVER_PROTO3i(type, func, type1, type2, type3) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z) \
{ \ { \
DEBUG_INTERFACE3i(x, y, z); \ DEBUG_INTERFACE3i(x, y, z); \
_gserver_queue3i(gserver, asc, GSERVER_VIDEO_PROTO3i_ ## func, (uint32_t)x, (uint32_t)y, (uint32_t)z); \ _gserver_queue3i(gserver, asc, GSERVER_VIDEO_CALL3i_ ## func, (uint32_t)x, (uint32_t)y, (uint32_t)z); \
} }
#define GSERVER_PROTO3s(type, func, type1, type2, type3) \ #define GSERVER_PROTO3s(type, func, type1, type2, type3) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z) \
{ \ { \
DEBUG_INTERFACE3s(x, y, z); \ DEBUG_INTERFACE3s(x, y, z); \
_gserver_queue3s(gserver, asc, GSERVER_VIDEO_PROTO3s_ ## func, (uint16_t)x, (uint16_t)y, (uint16_t)z); \ _gserver_queue3s(gserver, asc, GSERVER_VIDEO_CALL3s_ ## func, (uint16_t)x, (uint16_t)y, (uint16_t)z); \
} }
#define GSERVER_PROTO4b(type, func, type1, type2, type3, type4) \ #define GSERVER_PROTO4b(type, func, type1, type2, type3, type4) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z, type4 t) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z, type4 t) \
{ \ { \
DEBUG_INTERFACE4b(x, y, z, t); \ DEBUG_INTERFACE4b(x, y, z, t); \
_gserver_queue4b(gserver, asc, GSERVER_VIDEO_PROTO4b_ ## func, (uint8_t)x, (uint8_t)y, (uint8_t)z, (uint8_t)t); \ _gserver_queue4b(gserver, asc, GSERVER_VIDEO_CALL4b_ ## func, (uint8_t)x, (uint8_t)y, (uint8_t)z, (uint8_t)t); \
} }
#define GSERVER_PROTO4d(type, func) \ #define GSERVER_PROTO4d(type, func) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, double x, double y, double z, double t) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, double x, double y, double z, double t) \
{ \ { \
DEBUG_INTERFACE4d(x, y, z, t); \ DEBUG_INTERFACE4d(x, y, z, t); \
_gserver_queue4d(gserver, asc, GSERVER_VIDEO_PROTO4d_ ## func, x, y, z, t); \ _gserver_queue4d(gserver, asc, GSERVER_VIDEO_CALL4d_ ## func, x, y, z, t); \
} }
#define GSERVER_PROTO4f(type, func) \ #define GSERVER_PROTO4f(type, func) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, float x, float y, float z, float t) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, float x, float y, float z, float t) \
{ \ { \
DEBUG_INTERFACE4f(x, y, z, t); \ DEBUG_INTERFACE4f(x, y, z, t); \
_gserver_queue4f(gserver, asc, GSERVER_VIDEO_PROTO4f_ ## func, x, y, z, t); \ _gserver_queue4f(gserver, asc, GSERVER_VIDEO_CALL4f_ ## func, x, y, z, t); \
} }
#define GSERVER_PROTO4i(type, func, type1, type2, type3, type4) \ #define GSERVER_PROTO4i(type, func, type1, type2, type3, type4) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z, type4 t) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z, type4 t) \
{ \ { \
DEBUG_INTERFACE4i(x, y, z, t); \ DEBUG_INTERFACE4i(x, y, z, t); \
_gserver_queue4i(gserver, asc, GSERVER_VIDEO_PROTO4i_ ## func, (uint32_t)x, (uint32_t)y, (uint32_t)z, (uint32_t)t); \ _gserver_queue4i(gserver, asc, GSERVER_VIDEO_CALL4i_ ## func, (uint32_t)x, (uint32_t)y, (uint32_t)z, (uint32_t)t); \
} }
#define GSERVER_PROTO4s(type, func, type1, type2, type3, type4) \ #define GSERVER_PROTO4s(type, func, type1, type2, type3, type4) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z, type4 t) \ type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z, type4 t) \
{ \ { \
DEBUG_INTERFACE4s(x, y, z, t); \ DEBUG_INTERFACE4s(x, y, z, t); \
_gserver_queue4s(gserver, asc, GSERVER_VIDEO_PROTO4s_ ## func, (uint16_t)x, (uint16_t)y, (uint16_t)z, (uint16_t)t); \ _gserver_queue4s(gserver, asc, GSERVER_VIDEO_CALL4s_ ## func, (uint16_t)x, (uint16_t)y, (uint16_t)z, (uint16_t)t); \
} }
/* proto0 */ /* proto0 */
@ -586,74 +586,74 @@ static void _gserver_client_calls(GServer * gserver, GServerClient * client)
call = &client->calls[i]; call = &client->calls[i];
switch(call->type) switch(call->type)
{ {
case GSERVER_VIDEO_PROTO_0: case GSERVER_VIDEO_CALL_0:
vp->proto0(vp, call->func); vp->call0(vp, call->func);
break; break;
case GSERVER_VIDEO_PROTO_1d: case GSERVER_VIDEO_CALL_1d:
vp->proto1d(vp, call->func, call->args._1d.x); vp->call1d(vp, call->func, call->args._1d.x);
break; break;
case GSERVER_VIDEO_PROTO_1i: case GSERVER_VIDEO_CALL_1i:
vp->proto1i(vp, call->func, call->args._1i.x); vp->call1i(vp, call->func, call->args._1i.x);
break; break;
case GSERVER_VIDEO_PROTO_2f: case GSERVER_VIDEO_CALL_2f:
vp->proto2f(vp, call->func, call->args._2f.x, vp->call2f(vp, call->func, call->args._2f.x,
call->args._3f.y); call->args._3f.y);
break; break;
case GSERVER_VIDEO_PROTO_2i: case GSERVER_VIDEO_CALL_2i:
vp->proto2i(vp, call->func, call->args._2i.x, vp->call2i(vp, call->func, call->args._2i.x,
call->args._2i.y); call->args._2i.y);
break; break;
case GSERVER_VIDEO_PROTO_3b: case GSERVER_VIDEO_CALL_3b:
vp->proto3b(vp, call->func, call->args._3b.x, vp->call3b(vp, call->func, call->args._3b.x,
call->args._3b.y, call->args._3b.y,
call->args._3b.z); call->args._3b.z);
break; break;
case GSERVER_VIDEO_PROTO_3d: case GSERVER_VIDEO_CALL_3d:
vp->proto3d(vp, call->func, call->args._3d.x, vp->call3d(vp, call->func, call->args._3d.x,
call->args._3d.y, call->args._3d.y,
call->args._3d.z); call->args._3d.z);
break; break;
case GSERVER_VIDEO_PROTO_3f: case GSERVER_VIDEO_CALL_3f:
vp->proto3f(vp, call->func, call->args._3f.x, vp->call3f(vp, call->func, call->args._3f.x,
call->args._3f.y, call->args._3f.y,
call->args._3f.z); call->args._3f.z);
break; break;
case GSERVER_VIDEO_PROTO_3i: case GSERVER_VIDEO_CALL_3i:
vp->proto3i(vp, call->func, call->args._3i.x, vp->call3i(vp, call->func, call->args._3i.x,
call->args._3i.y, call->args._3i.y,
call->args._3i.z); call->args._3i.z);
break; break;
case GSERVER_VIDEO_PROTO_3s: case GSERVER_VIDEO_CALL_3s:
vp->proto3s(vp, call->func, call->args._3s.x, vp->call3s(vp, call->func, call->args._3s.x,
call->args._3s.y, call->args._3s.y,
call->args._3s.z); call->args._3s.z);
break; break;
case GSERVER_VIDEO_PROTO_4b: case GSERVER_VIDEO_CALL_4b:
vp->proto4b(vp, call->func, call->args._4b.x, vp->call4b(vp, call->func, call->args._4b.x,
call->args._4b.y, call->args._4b.y,
call->args._4b.z, call->args._4b.z,
call->args._4b.t); call->args._4b.t);
break; break;
case GSERVER_VIDEO_PROTO_4d: case GSERVER_VIDEO_CALL_4d:
vp->proto4d(vp, call->func, call->args._4d.x, vp->call4d(vp, call->func, call->args._4d.x,
call->args._4d.y, call->args._4d.y,
call->args._4d.z, call->args._4d.z,
call->args._4d.t); call->args._4d.t);
break; break;
case GSERVER_VIDEO_PROTO_4f: case GSERVER_VIDEO_CALL_4f:
vp->proto4f(vp, call->func, call->args._4f.x, vp->call4f(vp, call->func, call->args._4f.x,
call->args._4f.y, call->args._4f.y,
call->args._4f.z, call->args._4f.z,
call->args._4f.t); call->args._4f.t);
break; break;
case GSERVER_VIDEO_PROTO_4i: case GSERVER_VIDEO_CALL_4i:
vp->proto4i(vp, call->func, call->args._4i.x, vp->call4i(vp, call->func, call->args._4i.x,
call->args._4i.y, call->args._4i.y,
call->args._4i.z, call->args._4i.z,
call->args._4i.t); call->args._4i.t);
break; break;
case GSERVER_VIDEO_PROTO_4s: case GSERVER_VIDEO_CALL_4s:
vp->proto4s(vp, call->func, call->args._4s.x, vp->call4s(vp, call->func, call->args._4s.x,
call->args._4s.y, call->args._4s.y,
call->args._4s.z, call->args._4s.z,
call->args._4s.t); call->args._4s.t);
@ -687,7 +687,7 @@ static GServerClient * _gserver_get_client(GServer * gserver,
/* gserver_queue */ /* gserver_queue */
static GServerCall * _gserver_queue(GServer * gserver, AppServerClient * asc, static GServerCall * _gserver_queue(GServer * gserver, AppServerClient * asc,
GServerVideoProto type, unsigned int func) GServerVideoCall type, unsigned int func)
{ {
GServerCall * ret = NULL; GServerCall * ret = NULL;
GServerClient * gsc; GServerClient * gsc;
@ -714,11 +714,11 @@ static GServerCall * _gserver_queue(GServer * gserver, AppServerClient * asc,
/* gserver_queue0 */ /* gserver_queue0 */
static int _gserver_queue0(GServer * gserver, AppServerClient * asc, static int _gserver_queue0(GServer * gserver, AppServerClient * asc,
GServerVideoProto0 func) GServerVideoCall0 func)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_0, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_0, func))
== NULL) == NULL)
return -1; return -1;
/* FIXME intercept SwapBuffers() and glClear() */ /* FIXME intercept SwapBuffers() and glClear() */
@ -728,11 +728,11 @@ static int _gserver_queue0(GServer * gserver, AppServerClient * asc,
/* gserver_queue1d */ /* gserver_queue1d */
static int _gserver_queue1d(GServer * gserver, AppServerClient * asc, static int _gserver_queue1d(GServer * gserver, AppServerClient * asc,
GServerVideoProto1d func, double x) GServerVideoCall1d func, double x)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_1d, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_1d, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._1d.x = x; gsc->args._1d.x = x;
@ -742,11 +742,11 @@ static int _gserver_queue1d(GServer * gserver, AppServerClient * asc,
/* gserver_queue1i */ /* gserver_queue1i */
static int _gserver_queue1i(GServer * gserver, AppServerClient * asc, static int _gserver_queue1i(GServer * gserver, AppServerClient * asc,
GServerVideoProto1i func, uint32_t x) GServerVideoCall1i func, uint32_t x)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_1i, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_1i, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._1i.x = x; gsc->args._1i.x = x;
@ -756,11 +756,11 @@ static int _gserver_queue1i(GServer * gserver, AppServerClient * asc,
/* gserver_queue2f */ /* gserver_queue2f */
static int _gserver_queue2f(GServer * gserver, AppServerClient * asc, static int _gserver_queue2f(GServer * gserver, AppServerClient * asc,
GServerVideoProto2f func, float x, float y) GServerVideoCall2f func, float x, float y)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_2f, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_2f, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._2f.x = x; gsc->args._2f.x = x;
@ -771,11 +771,11 @@ static int _gserver_queue2f(GServer * gserver, AppServerClient * asc,
/* gserver_queue2i */ /* gserver_queue2i */
static int _gserver_queue2i(GServer * gserver, AppServerClient * asc, static int _gserver_queue2i(GServer * gserver, AppServerClient * asc,
GServerVideoProto2i func, uint32_t x, uint32_t y) GServerVideoCall2i func, uint32_t x, uint32_t y)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_2i, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_2i, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._2i.x = x; gsc->args._2i.x = x;
@ -786,11 +786,11 @@ static int _gserver_queue2i(GServer * gserver, AppServerClient * asc,
/* gserver_queue3b */ /* gserver_queue3b */
static int _gserver_queue3b(GServer * gserver, AppServerClient * asc, static int _gserver_queue3b(GServer * gserver, AppServerClient * asc,
GServerVideoProto3b func, uint8_t x, uint8_t y, uint8_t z) GServerVideoCall3b func, uint8_t x, uint8_t y, uint8_t z)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_3b, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_3b, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._3b.x = x; gsc->args._3b.x = x;
@ -802,11 +802,11 @@ static int _gserver_queue3b(GServer * gserver, AppServerClient * asc,
/* gserver_queue3d */ /* gserver_queue3d */
static int _gserver_queue3d(GServer * gserver, AppServerClient * asc, static int _gserver_queue3d(GServer * gserver, AppServerClient * asc,
GServerVideoProto3d func, double x, double y, double z) GServerVideoCall3d func, double x, double y, double z)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_3d, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_3d, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._3d.x = x; gsc->args._3d.x = x;
@ -818,11 +818,11 @@ static int _gserver_queue3d(GServer * gserver, AppServerClient * asc,
/* gserver_queue3f */ /* gserver_queue3f */
static int _gserver_queue3f(GServer * gserver, AppServerClient * asc, static int _gserver_queue3f(GServer * gserver, AppServerClient * asc,
GServerVideoProto3f func, float x, float y, float z) GServerVideoCall3f func, float x, float y, float z)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_3f, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_3f, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._3f.x = x; gsc->args._3f.x = x;
@ -834,11 +834,11 @@ static int _gserver_queue3f(GServer * gserver, AppServerClient * asc,
/* gserver_queue3i */ /* gserver_queue3i */
static int _gserver_queue3i(GServer * gserver, AppServerClient * asc, static int _gserver_queue3i(GServer * gserver, AppServerClient * asc,
GServerVideoProto3i func, uint32_t x, uint32_t y, uint32_t z) GServerVideoCall3i func, uint32_t x, uint32_t y, uint32_t z)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_3i, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_3i, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._3i.x = x; gsc->args._3i.x = x;
@ -850,11 +850,11 @@ static int _gserver_queue3i(GServer * gserver, AppServerClient * asc,
/* gserver_queue3s */ /* gserver_queue3s */
static int _gserver_queue3s(GServer * gserver, AppServerClient * asc, static int _gserver_queue3s(GServer * gserver, AppServerClient * asc,
GServerVideoProto3s func, uint16_t x, uint16_t y, uint16_t z) GServerVideoCall3s func, uint16_t x, uint16_t y, uint16_t z)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_3s, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_3s, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._3s.x = x; gsc->args._3s.x = x;
@ -866,12 +866,12 @@ static int _gserver_queue3s(GServer * gserver, AppServerClient * asc,
/* gserver_queue4b */ /* gserver_queue4b */
static int _gserver_queue4b(GServer * gserver, AppServerClient * asc, static int _gserver_queue4b(GServer * gserver, AppServerClient * asc,
GServerVideoProto4b func, uint8_t x, uint8_t y, uint8_t z, GServerVideoCall4b func, uint8_t x, uint8_t y, uint8_t z,
uint8_t t) uint8_t t)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_4b, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_4b, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._4b.x = x; gsc->args._4b.x = x;
@ -884,12 +884,12 @@ static int _gserver_queue4b(GServer * gserver, AppServerClient * asc,
/* gserver_queue4d */ /* gserver_queue4d */
static int _gserver_queue4d(GServer * gserver, AppServerClient * asc, static int _gserver_queue4d(GServer * gserver, AppServerClient * asc,
GServerVideoProto4d func, double x, double y, double z, GServerVideoCall4d func, double x, double y, double z,
double t) double t)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_4d, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_4d, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._4d.x = x; gsc->args._4d.x = x;
@ -902,11 +902,11 @@ static int _gserver_queue4d(GServer * gserver, AppServerClient * asc,
/* gserver_queue4f */ /* gserver_queue4f */
static int _gserver_queue4f(GServer * gserver, AppServerClient * asc, static int _gserver_queue4f(GServer * gserver, AppServerClient * asc,
GServerVideoProto4f func, float x, float y, float z, float t) GServerVideoCall4f func, float x, float y, float z, float t)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_4f, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_4f, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._4f.x = x; gsc->args._4f.x = x;
@ -919,12 +919,12 @@ static int _gserver_queue4f(GServer * gserver, AppServerClient * asc,
/* gserver_queue4i */ /* gserver_queue4i */
static int _gserver_queue4i(GServer * gserver, AppServerClient * asc, static int _gserver_queue4i(GServer * gserver, AppServerClient * asc,
GServerVideoProto4i func, uint32_t x, uint32_t y, uint32_t z, GServerVideoCall4i func, uint32_t x, uint32_t y, uint32_t z,
uint32_t t) uint32_t t)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_4i, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_4i, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._4i.x = x; gsc->args._4i.x = x;
@ -937,12 +937,12 @@ static int _gserver_queue4i(GServer * gserver, AppServerClient * asc,
/* gserver_queue4s */ /* gserver_queue4s */
static int _gserver_queue4s(GServer * gserver, AppServerClient * asc, static int _gserver_queue4s(GServer * gserver, AppServerClient * asc,
GServerVideoProto4s func, uint16_t x, uint16_t y, uint16_t z, GServerVideoCall4s func, uint16_t x, uint16_t y, uint16_t z,
uint16_t t) uint16_t t)
{ {
GServerCall * gsc; GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_4s, func)) if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_CALL_4s, func))
== NULL) == NULL)
return -1; return -1;
gsc->args._4s.x = x; gsc->args._4s.x = x;