[Toxine-cvs] CVS: toxine/src/plugins vo_aa.c,1.3,1.4 vo_dxr3.c,1.3,1.4 vo_plugin.h,1.3,1.4 vo_x11.c,
Brought to you by:
f1rmb
Menu
▾
▴
[Toxine-cvs] CVS: toxine/src/plugins vo_aa.c,1.3,1.4 vo_dxr3.c,1.3,1.4 vo_plugin.h,1.3,1.4 vo_x11.c,1.5,1.6
|
From: Daniel Caujolle-B. <f1...@us...> - 2002-07-03 09:03:19
|
Update of /cvsroot/toxine/toxine/src/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv9012/src/plugins
Modified Files:
vo_aa.c vo_dxr3.c vo_plugin.h vo_x11.c
Log Message:
Change few functions prototype in toxine_vo_plugin_t (get rid of
toxine_vo_plugin_t * param, it's self contained in the toxine_t object.).
Index: vo_aa.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_aa.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vo_aa.c 3 Jul 2002 08:44:42 -0000 1.3
+++ vo_aa.c 3 Jul 2002 09:03:17 -0000 1.4
@@ -37,8 +37,9 @@
aa_context *context;
} aa_private_t;
-static void init_video_out(toxine_t *tox, toxine_vo_plugin_t *vop) {
- aa_private_t *private = (aa_private_t *) vop->private;
+static void init_video_out(toxine_t *tox) {
+ toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
+ aa_private_t *private = (aa_private_t *) vop->private;
private->context = aa_autoinit(&aa_defparams);
if(private->context == NULL) {
@@ -82,8 +83,9 @@
pthread_exit(NULL);
}
-static void deinit_video_out(toxine_t *tox, toxine_vo_plugin_t *vop) {
- aa_private_t *private = (aa_private_t *) vop->private;
+static void deinit_video_out(toxine_t *tox) {
+ toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
+ aa_private_t *private = (aa_private_t *) vop->private;
if(private->context) {
aa_showcursor(private->context);
@@ -148,14 +150,14 @@
/*
*
*/
-static int is_fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+static int is_fullscreen(toxine_t *tox) {
return 0;
}
/*
*
*/
-static void fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+static void fullscreen(toxine_t *tox) {
}
toxine_vo_plugin_t *toxine_load_vo_plugin(toxine_t *tox) {
Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_dxr3.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vo_dxr3.c 3 Jul 2002 08:44:42 -0000 1.3
+++ vo_dxr3.c 3 Jul 2002 09:03:17 -0000 1.4
@@ -34,7 +34,7 @@
int dummy;
} dxr3_private_t;
-static void init_video_out(toxine_t *tox, toxine_vo_plugin_t *vop) {
+static void init_video_out(toxine_t *tox) {
/* First, we have to initialize the config entry */
(void *) tox->config->register_string(tox->config,
@@ -74,8 +74,9 @@
pthread_exit(NULL);
}
-static void deinit_video_out(toxine_t *tox, toxine_vo_plugin_t *vop) {
- dxr3_private_t *private = (dxr3_private_t *) vop->private;
+static void deinit_video_out(toxine_t *tox) {
+ toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
+ dxr3_private_t *private = (dxr3_private_t *) vop->private;
free(private);
free(vop);
@@ -128,11 +129,11 @@
static void receive_xine_event(toxine_t *tox, xine_event_t *event) {
}
-static int is_fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+static int is_fullscreen(toxine_t *tox) {
return 0;
}
-static void fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+static void fullscreen(toxine_t *tox) {
}
toxine_vo_plugin_t *toxine_load_vo_plugin(toxine_t *tox) {
Index: vo_plugin.h
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_plugin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vo_plugin.h 3 Jul 2002 08:44:42 -0000 1.3
+++ vo_plugin.h 3 Jul 2002 09:03:17 -0000 1.4
@@ -27,9 +27,9 @@
typedef struct toxine_vo_plugin_s toxine_vo_plugin_t;
struct toxine_vo_plugin_s {
- void (*video_out_init)(toxine_t *, toxine_vo_plugin_t *);
+ void (*video_out_init)(toxine_t *);
void *(*video_out_event_loop)(void *);
- void (*video_out_deinit)(toxine_t *, toxine_vo_plugin_t *);
+ void (*video_out_deinit)(toxine_t *);
char *(*get_identifier)(void);
char **(*get_names)(void);
uint32_t (*get_capabilities)(toxine_t *);
@@ -38,8 +38,8 @@
int (*set_property)(toxine_t *, int property, int value);
char *(*get_help)(void);
void (*receive_xine_event)(toxine_t *, xine_event_t *);
- int (*is_fullscreen)(toxine_t *, toxine_vo_plugin_t *);
- void (*fullscreen)(toxine_t *, toxine_vo_plugin_t *);
+ int (*is_fullscreen)(toxine_t *);
+ void (*fullscreen)(toxine_t *);
void *private;
};
Index: vo_x11.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/plugins/vo_x11.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vo_x11.c 3 Jul 2002 08:44:42 -0000 1.5
+++ vo_x11.c 3 Jul 2002 09:03:17 -0000 1.6
@@ -450,20 +450,21 @@
/*
*
*/
-static void video_window_init(toxine_t *tox, toxine_vo_plugin_t *vop) {
- Pixmap cursor_no, cursor_yes, cursor_yes_bg;
- char *display_name = ":0.0";
- XColor dummy;
- x11_private_t *private = (x11_private_t *) vop->private;
- static char *window_title = "toxine video output";
- XSizeHints hint;
- XSetWindowAttributes attr;
- Atom XA_NO_BORDER, XA_WIN_LAYER;
- XEvent xev;
- XGCValues xgcv;
- MWMHints mwmhints;
- XWMHints *wm_hint;
- long propvalue[1];
+static void video_window_init(toxine_t *tox) {
+ toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
+ Pixmap cursor_no, cursor_yes, cursor_yes_bg;
+ char *display_name = ":0.0";
+ XColor dummy;
+ x11_private_t *private = (x11_private_t *) vop->private;
+ static char *window_title = "toxine video output";
+ XSizeHints hint;
+ XSetWindowAttributes attr;
+ Atom XA_NO_BORDER, XA_WIN_LAYER;
+ XEvent xev;
+ XGCValues xgcv;
+ MWMHints mwmhints;
+ XWMHints *wm_hint;
+ long propvalue[1];
if(!XInitThreads()) {
perr("XInitThreads failed - looks like you don't have a "
@@ -748,8 +749,8 @@
/*
*
*/
-static void init_video_out(toxine_t *tox, toxine_vo_plugin_t *vop) {
- video_window_init (tox, vop);
+static void init_video_out(toxine_t *tox) {
+ video_window_init (tox);
}
/*
@@ -905,7 +906,8 @@
/*
*
*/
-static void deinit_video_out(toxine_t *tox, toxine_vo_plugin_t *vop) {
+static void deinit_video_out(toxine_t *tox) {
+ toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
x11_private_t *private = (x11_private_t *) vop->private;
XWindowAttributes wattr;
Status status;
@@ -1026,15 +1028,16 @@
/*
*
*/
-static int is_fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
- x11_private_t *private = (x11_private_t *) vop->private;
+static int is_fullscreen(toxine_t *tox) {
+ toxine_vo_plugin_t *vop = (toxine_vo_plugin_t *) tox->video.cur_plugin;
+ x11_private_t *private = (x11_private_t *) vop->private;
return (private->fullscreen ? 1 : 0);
}
/*
*
*/
-static void fullscreen(toxine_t *tox, toxine_vo_plugin_t *vop) {
+static void fullscreen(toxine_t *tox) {
toggle_fullscreen(tox);
}
|
