diff options
author | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-11-20 11:57:38 +0000 |
---|---|---|
committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-11-20 11:57:38 +0000 |
commit | 4e95a4f5224e241075b8cd86b4423c85c1d0ee26 (patch) | |
tree | cd9287e15591dce94560663ad66fc4005d006012 /src/video_out | |
parent | 74893748b868ecc6ae539fa66e326e06947c4ac9 (diff) | |
download | xine-lib-4e95a4f5224e241075b8cd86b4423c85c1d0ee26.tar.gz xine-lib-4e95a4f5224e241075b8cd86b4423c85c1d0ee26.tar.bz2 |
engine modifications to allow post plugin layer:
* new public output interface xine_{audio,video}_port_t instead of
xine_{ao,vo}_driver_t, old names kept as aliases for compatibility
* modified the engine to allow multiple streams per output
* renaming of some internal structures according to public changes
* moving SCR out of per-stream-metronom into a global metronom_clock_t
residing in xine_t and therefore easily available to the output layer
* adapting all available plugins
(note to external projects: the compiler will help you a lot, if a plugin
compiles, it is adapted, because all changes add new parameters to some
functions)
* bump up all interface versions because of xine_t and xine_stream_t changes
CVS patchset: 3312
CVS date: 2002/11/20 11:57:38
Diffstat (limited to 'src/video_out')
-rw-r--r-- | src/video_out/video_out_aa.c | 26 | ||||
-rw-r--r-- | src/video_out/video_out_fb.c | 24 | ||||
-rw-r--r-- | src/video_out/video_out_none.c | 28 | ||||
-rw-r--r-- | src/video_out/video_out_pgx64.c | 8 | ||||
-rw-r--r-- | src/video_out/video_out_sdl.c | 22 | ||||
-rw-r--r-- | src/video_out/video_out_syncfb.c | 24 | ||||
-rw-r--r-- | src/video_out/video_out_vidix.c | 30 | ||||
-rw-r--r-- | src/video_out/video_out_xshm.c | 30 | ||||
-rw-r--r-- | src/video_out/video_out_xv.c | 30 |
9 files changed, 111 insertions, 111 deletions
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 85c5d5ca1..f1fb360e2 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_aa.c,v 1.29 2002/10/18 20:04:24 f1rmb Exp $ + * $Id: video_out_aa.c,v 1.30 2002/11/20 11:57:48 mroi Exp $ * * video_out_aa.c, ascii-art output plugin for xine * @@ -63,7 +63,7 @@ typedef struct aa_frame_s { } aa_frame_t; typedef struct { - xine_vo_driver_t vo_driver; + vo_driver_t vo_driver; config_values_t *config; int user_ratio; @@ -81,7 +81,7 @@ typedef struct { /* * our video driver */ -static uint32_t aa_get_capabilities (xine_vo_driver_t *this) { +static uint32_t aa_get_capabilities (vo_driver_t *this) { return VO_CAP_YV12 | VO_CAP_YUY2; } @@ -103,7 +103,7 @@ static void aa_frame_field (vo_frame_t *vo_img, int which_field) { } -static vo_frame_t *aa_alloc_frame(xine_vo_driver_t *this) { +static vo_frame_t *aa_alloc_frame(vo_driver_t *this) { aa_frame_t *frame; frame = (aa_frame_t *) malloc (sizeof (aa_frame_t)); @@ -117,7 +117,7 @@ static vo_frame_t *aa_alloc_frame(xine_vo_driver_t *this) { return (vo_frame_t*) frame; } -static void aa_update_frame_format (xine_vo_driver_t *this, vo_frame_t *img, +static void aa_update_frame_format (vo_driver_t *this, vo_frame_t *img, uint32_t width, uint32_t height, int ratio_code, int format, int flags) { @@ -172,7 +172,7 @@ static void aa_update_frame_format (xine_vo_driver_t *this, vo_frame_t *img, /* printf ("aa_update_format done\n"); */ } -static void aa_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen) { +static void aa_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { int x,y; double x_fact, y_fact; /* ratio between aa's and frame's width/height */ @@ -225,7 +225,7 @@ static void aa_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen) } -static int aa_get_property (xine_vo_driver_t *this_gen, int property) { +static int aa_get_property (vo_driver_t *this_gen, int property) { aa_driver_t *this = (aa_driver_t*) this_gen; if ( property == VO_PROP_ASPECT_RATIO) { @@ -237,7 +237,7 @@ static int aa_get_property (xine_vo_driver_t *this_gen, int property) { return 0; } -static int aa_set_property (xine_vo_driver_t *this_gen, +static int aa_set_property (vo_driver_t *this_gen, int property, int value) { aa_driver_t *this = (aa_driver_t*) this_gen; @@ -253,20 +253,20 @@ static int aa_set_property (xine_vo_driver_t *this_gen, return value; } -static void aa_get_property_min_max (xine_vo_driver_t *this_gen, +static void aa_get_property_min_max (vo_driver_t *this_gen, int property, int *min, int *max) { *min = 0; *max = 0; } -static void aa_dispose (xine_vo_driver_t *this_gen) { +static void aa_dispose (vo_driver_t *this_gen) { } -static int aa_redraw_needed (xine_vo_driver_t *this_gen) { +static int aa_redraw_needed (vo_driver_t *this_gen) { return 0; } -static xine_vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) { +static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) { aa_class_t *class = (aa_class_t *) class_gen; aa_driver_t *this; @@ -328,6 +328,6 @@ static vo_info_t vo_info_aa = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 10, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class }, + { PLUGIN_VIDEO_OUT, 11, "aa", XINE_VERSION_CODE, &vo_info_aa, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index bf113ff01..ead079c23 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_fb.c,v 1.17 2002/09/05 20:44:42 mroi Exp $ + * $Id: video_out_fb.c,v 1.18 2002/11/20 11:57:48 mroi Exp $ * * video_out_fb.c, frame buffer xine driver by Miguel Freitas * @@ -91,7 +91,7 @@ typedef struct fb_frame_s { typedef struct fb_driver_s { - xine_vo_driver_t vo_driver; + vo_driver_t vo_driver; config_values_t *config; @@ -121,7 +121,7 @@ typedef struct fb_driver_s { * and now, the driver functions */ -static uint32_t fb_get_capabilities (xine_vo_driver_t *this_gen) { +static uint32_t fb_get_capabilities (vo_driver_t *this_gen) { return VO_CAP_COPIES_IMAGE | VO_CAP_YV12 | VO_CAP_YUY2 | VO_CAP_BRIGHTNESS; } @@ -172,7 +172,7 @@ static void fb_frame_dispose (vo_frame_t *vo_img) { } -static vo_frame_t *fb_alloc_frame (xine_vo_driver_t *this_gen) { +static vo_frame_t *fb_alloc_frame (vo_driver_t *this_gen) { fb_driver_t *this = (fb_driver_t *) this_gen; fb_frame_t *frame ; @@ -227,7 +227,7 @@ static void fb_compute_rgb_size (fb_driver_t *this, fb_frame_t *frame) { #endif } -static void fb_update_frame_format (xine_vo_driver_t *this_gen, +static void fb_update_frame_format (vo_driver_t *this_gen, vo_frame_t *frame_gen, uint32_t width, uint32_t height, int ratio_code, int format, int flags) { @@ -388,7 +388,7 @@ static void fb_overlay_clut_yuv2rgb(fb_driver_t *this, vo_overlay_t *overlay, } } -static void fb_overlay_blend (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { +static void fb_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { fb_driver_t *this = (fb_driver_t *) this_gen; fb_frame_t *frame = (fb_frame_t *) frame_gen; @@ -420,11 +420,11 @@ static void fb_overlay_blend (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, } } -static int fb_redraw_needed (xine_vo_driver_t *this_gen) { +static int fb_redraw_needed (vo_driver_t *this_gen) { return 0; } -static void fb_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen) { +static void fb_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { fb_driver_t *this = (fb_driver_t *) this_gen; fb_frame_t *frame = (fb_frame_t *) frame_gen; @@ -458,7 +458,7 @@ static void fb_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen) frame->vo_frame.displayed (&frame->vo_frame); } -static int fb_get_property (xine_vo_driver_t *this_gen, int property) { +static int fb_get_property (vo_driver_t *this_gen, int property) { fb_driver_t *this = (fb_driver_t *) this_gen; @@ -497,7 +497,7 @@ static int fb_set_property (vo_driver_t *this_gen, return value; } -static void fb_get_property_min_max (xine_vo_driver_t *this_gen, +static void fb_get_property_min_max (vo_driver_t *this_gen, int property, int *min, int *max) { /* fb_driver_t *this = (fb_driver_t *) this_gen; */ @@ -518,14 +518,14 @@ static int is_fullscreen_size (fb_driver_t *this, int w, int h) return 0; } -static int fb_gui_data_exchange (xine_vo_driver_t *this_gen, +static int fb_gui_data_exchange (vo_driver_t *this_gen, int data_type, void *data) { return 0; } -static void fb_exit (xine_vo_driver_t *this_gen) { +static void fb_exit (vo_driver_t *this_gen) { fb_driver_t *this = (fb_driver_t *) this_gen; diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c index c8f81f0d8..e29caa502 100644 --- a/src/video_out/video_out_none.c +++ b/src/video_out/video_out_none.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_none.c,v 1.2 2002/11/11 20:02:39 f1rmb Exp $ + * $Id: video_out_none.c,v 1.3 2002/11/20 11:57:48 mroi Exp $ * * Was originally part of toxine frontend. */ @@ -48,7 +48,7 @@ typedef struct { } none_frame_t; typedef struct { - xine_vo_driver_t vo_driver; + vo_driver_t vo_driver; config_values_t *config; int ratio; } none_driver_t; @@ -86,11 +86,11 @@ static void none_frame_field(vo_frame_t *vo_frame, int which_field) { /* do nothing */ } -static uint32_t none_get_capabilities(xine_vo_driver_t *vo_driver) { +static uint32_t none_get_capabilities(vo_driver_t *vo_driver) { return VO_CAP_YV12 | VO_CAP_YUY2; } -static vo_frame_t *none_alloc_frame(xine_vo_driver_t *vo_driver) { +static vo_frame_t *none_alloc_frame(vo_driver_t *vo_driver) { none_frame_t *frame; frame = (none_frame_t *) malloc(sizeof(none_frame_t)); @@ -113,7 +113,7 @@ static vo_frame_t *none_alloc_frame(xine_vo_driver_t *vo_driver) { return (vo_frame_t *)frame; } -static void none_update_frame_format(xine_vo_driver_t *vo_driver, vo_frame_t *vo_frame, +static void none_update_frame_format(vo_driver_t *vo_driver, vo_frame_t *vo_frame, uint32_t width, uint32_t height, int ratio_code, int format, int flags) { none_frame_t *frame = (none_frame_t *)vo_frame; @@ -160,14 +160,14 @@ static void none_update_frame_format(xine_vo_driver_t *vo_driver, vo_frame_t *vo frame->ratio_code = ratio_code; } -static void none_display_frame(xine_vo_driver_t *vo_driver, vo_frame_t *vo_frame) { +static void none_display_frame(vo_driver_t *vo_driver, vo_frame_t *vo_frame) { /* none_driver_t *driver = (none_driver_t *)vo_driver; */ none_frame_t *frame = (none_frame_t *)vo_frame; frame->vo_frame.displayed(&frame->vo_frame); } -static int none_get_property(xine_vo_driver_t *vo_driver, int property) { +static int none_get_property(vo_driver_t *vo_driver, int property) { none_driver_t *driver = (none_driver_t *)vo_driver; switch(property) { @@ -183,7 +183,7 @@ static int none_get_property(xine_vo_driver_t *vo_driver, int property) { return 0; } -static int none_set_property(xine_vo_driver_t *vo_driver, int property, int value) { +static int none_set_property(vo_driver_t *vo_driver, int property, int value) { none_driver_t *driver = (none_driver_t *)vo_driver; switch(property) { @@ -201,13 +201,13 @@ static int none_set_property(xine_vo_driver_t *vo_driver, int property, int valu return value; } -static void none_get_property_min_max(xine_vo_driver_t *vo_driver, +static void none_get_property_min_max(vo_driver_t *vo_driver, int property, int *min, int *max) { *min = 0; *max = 0; } -static int none_gui_data_exchange(xine_vo_driver_t *vo_driver, int data_type, void *data) { +static int none_gui_data_exchange(vo_driver_t *vo_driver, int data_type, void *data) { /* none_driver_t *this = (none_driver_t *) vo_driver; */ switch (data_type) { @@ -222,17 +222,17 @@ static int none_gui_data_exchange(xine_vo_driver_t *vo_driver, int data_type, vo return 0; } -static void none_dispose(xine_vo_driver_t *vo_driver) { +static void none_dispose(vo_driver_t *vo_driver) { none_driver_t *this = (none_driver_t *) vo_driver; free(this); } -static int none_redraw_needed(xine_vo_driver_t *vo_driver) { +static int none_redraw_needed(vo_driver_t *vo_driver) { return 0; } -static xine_vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void *visual) { +static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void *visual) { none_class_t *class = (none_class_t *) driver_class; none_driver_t *driver; @@ -297,6 +297,6 @@ static vo_info_t vo_info_none = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 10, "none", XINE_VERSION_CODE, &vo_info_none, init_class }, + { PLUGIN_VIDEO_OUT, 11, "none", XINE_VERSION_CODE, &vo_info_none, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index a39896573..b59e623e3 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_pgx64.c,v 1.13 2002/11/02 22:30:21 komadori Exp $ + * $Id: video_out_pgx64.c,v 1.14 2002/11/20 11:57:48 mroi Exp $ * * video_out_pgx64.c, Sun PGX64/PGX24 output plugin for xine * @@ -116,7 +116,7 @@ typedef struct { } pgx64_frame_t; typedef struct { - xine_vo_driver_t vo_driver; + vo_driver_t vo_driver; vo_scale_t vo_scale; pgx64_driver_class_t *class; pgx64_frame_t *current; @@ -833,8 +833,8 @@ static pgx64_driver_class_t* pgx64fb_init_class(xine_t *xine, void *visual_gen) plugin_info_t xine_plugin_info[] = { #ifdef HAVE_X11 - {PLUGIN_VIDEO_OUT, 10, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, (void*)pgx64_init_class}, + {PLUGIN_VIDEO_OUT, 11, "pgx64", XINE_VERSION_CODE, &vo_info_pgx64, (void*)pgx64_init_class}, #endif - {PLUGIN_VIDEO_OUT, 10, "pgx64fb", XINE_VERSION_CODE, &vo_info_pgx64fb, (void*)pgx64fb_init_class}, + {PLUGIN_VIDEO_OUT, 11, "pgx64fb", XINE_VERSION_CODE, &vo_info_pgx64fb, (void*)pgx64fb_init_class}, {PLUGIN_NONE, 0, "", 0, NULL, NULL} }; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index 994e7e371..bfe74aeea 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_sdl.c,v 1.14 2002/09/05 20:44:42 mroi Exp $ + * $Id: video_out_sdl.c,v 1.15 2002/11/20 11:57:48 mroi Exp $ * * video_out_sdl.c, Simple DirectMedia Layer * @@ -75,7 +75,7 @@ typedef struct sdl_frame_s { struct sdl_driver_s { - xine_vo_driver_t vo_driver; + vo_driver_t vo_driver; config_values_t *config; @@ -98,7 +98,7 @@ struct sdl_driver_s { }; -static uint32_t sdl_get_capabilities (xine_vo_driver_t *this_gen) { +static uint32_t sdl_get_capabilities (vo_driver_t *this_gen) { sdl_driver_t *this = (sdl_driver_t *) this_gen; @@ -119,7 +119,7 @@ static void sdl_frame_dispose (vo_frame_t *vo_img) { free (frame); } -static vo_frame_t *sdl_alloc_frame (xine_vo_driver_t *this_gen) { +static vo_frame_t *sdl_alloc_frame (vo_driver_t *this_gen) { sdl_frame_t *frame ; @@ -160,7 +160,7 @@ static void sdl_compute_output_size (sdl_driver_t *this) { } -static void sdl_update_frame_format (xine_vo_driver_t *this_gen, +static void sdl_update_frame_format (vo_driver_t *this_gen, vo_frame_t *frame_gen, uint32_t width, uint32_t height, int ratio_code, int format, int flags) { @@ -219,7 +219,7 @@ static void sdl_update_frame_format (xine_vo_driver_t *this_gen, /* * */ -static void sdl_overlay_blend (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { +static void sdl_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { sdl_frame_t *frame = (sdl_frame_t *) frame_gen; @@ -251,7 +251,7 @@ static void sdl_check_events (sdl_driver_t * this) } } -static int sdl_redraw_needed (xine_vo_driver_t *this_gen) { +static int sdl_redraw_needed (vo_driver_t *this_gen) { sdl_driver_t *this = (sdl_driver_t *) this_gen; int ret = 0; @@ -290,7 +290,7 @@ static int sdl_redraw_needed (xine_vo_driver_t *this_gen) { } -static void sdl_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen) { +static void sdl_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { sdl_driver_t *this = (sdl_driver_t *) this_gen; sdl_frame_t *frame = (sdl_frame_t *) frame_gen; @@ -331,7 +331,7 @@ static void sdl_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen pthread_mutex_unlock(&this->mutex); } -static int sdl_get_property (xine_vo_driver_t *this_gen, int property) { +static int sdl_get_property (vo_driver_t *this_gen, int property) { sdl_driver_t *this = (sdl_driver_t *) this_gen; @@ -360,7 +360,7 @@ static int sdl_set_property (vo_driver_t *this_gen, return value; } -static void sdl_get_property_min_max (xine_vo_driver_t *this_gen, +static void sdl_get_property_min_max (vo_driver_t *this_gen, int property, int *min, int *max) { /* sdl_driver_t *this = (sdl_driver_t *) this_gen; */ @@ -421,7 +421,7 @@ static int sdl_gui_data_exchange (vo_driver_t *this_gen, return ret; } -static void sdl_exit (xine_vo_driver_t *this_gen) { +static void sdl_exit (vo_driver_t *this_gen) { sdl_driver_t *this = (sdl_driver_t *) this_gen; diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 2c1e79b9e..f321e10f4 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_syncfb.c,v 1.78 2002/09/05 20:44:42 mroi Exp $ + * $Id: video_out_syncfb.c,v 1.79 2002/11/20 11:57:48 mroi Exp $ * * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine * @@ -78,7 +78,7 @@ typedef struct { struct syncfb_driver_s { - xine_vo_driver_t vo_driver; + vo_driver_t vo_driver; config_values_t *config; @@ -420,7 +420,7 @@ static void syncfb_compute_output_size(syncfb_driver_t *this) * public functions defined and used by the xine interface */ -static int syncfb_redraw_needed(xine_vo_driver_t* this_gen) +static int syncfb_redraw_needed(vo_driver_t* this_gen) { syncfb_driver_t* this = (syncfb_driver_t *) this_gen; @@ -438,7 +438,7 @@ static int syncfb_redraw_needed(xine_vo_driver_t* this_gen) return ret; } -static uint32_t syncfb_get_capabilities (xine_vo_driver_t *this_gen) +static uint32_t syncfb_get_capabilities (vo_driver_t *this_gen) { syncfb_driver_t *this = (syncfb_driver_t *) this_gen; @@ -460,7 +460,7 @@ static void syncfb_frame_dispose(vo_frame_t* vo_img) } } -static vo_frame_t* syncfb_alloc_frame(xine_vo_driver_t* this_gen) +static vo_frame_t* syncfb_alloc_frame(vo_driver_t* this_gen) { syncfb_frame_t* frame; @@ -488,7 +488,7 @@ static vo_frame_t* syncfb_alloc_frame(xine_vo_driver_t* this_gen) return (vo_frame_t *) frame; } -static void syncfb_update_frame_format(xine_vo_driver_t* this_gen, +static void syncfb_update_frame_format(vo_driver_t* this_gen, vo_frame_t* frame_gen, uint32_t width, uint32_t height, int ratio_code, int format, int flags) @@ -545,7 +545,7 @@ static void syncfb_update_frame_format(xine_vo_driver_t* this_gen, frame->ratio_code = ratio_code; } -static void syncfb_overlay_blend(xine_vo_driver_t* this_gen, vo_frame_t* frame_gen, vo_overlay_t* overlay) +static void syncfb_overlay_blend(vo_driver_t* this_gen, vo_frame_t* frame_gen, vo_overlay_t* overlay) { syncfb_frame_t* frame = (syncfb_frame_t *) frame_gen; @@ -558,7 +558,7 @@ static void syncfb_overlay_blend(xine_vo_driver_t* this_gen, vo_frame_t* frame_g } } -static void syncfb_display_frame(xine_vo_driver_t* this_gen, vo_frame_t* frame_gen) +static void syncfb_display_frame(vo_driver_t* this_gen, vo_frame_t* frame_gen) { syncfb_driver_t* this = (syncfb_driver_t *) this_gen; syncfb_frame_t* frame = (syncfb_frame_t *) frame_gen; @@ -631,14 +631,14 @@ static void syncfb_display_frame(xine_vo_driver_t* this_gen, vo_frame_t* frame_g this->bufinfo.id = -1; } -static int syncfb_get_property(xine_vo_driver_t* this_gen, int property) +static int syncfb_get_property(vo_driver_t* this_gen, int property) { syncfb_driver_t* this = (syncfb_driver_t *) this_gen; return this->props[property].value; } -static int syncfb_set_property(xine_vo_driver_t* this_gen, int property, int value) +static int syncfb_set_property(vo_driver_t* this_gen, int property, int value) { syncfb_driver_t* this = (syncfb_driver_t *) this_gen; @@ -745,7 +745,7 @@ static int syncfb_set_property(xine_vo_driver_t* this_gen, int property, int val return value; } -static void syncfb_get_property_min_max(xine_vo_driver_t *this_gen, +static void syncfb_get_property_min_max(vo_driver_t *this_gen, int property, int *min, int *max) { syncfb_driver_t* this = (syncfb_driver_t *) this_gen; @@ -790,7 +790,7 @@ static int syncfb_gui_data_exchange(vo_driver_t* this_gen, int data_type, return 0; } -static void syncfb_exit(xine_vo_driver_t *this_gen) +static void syncfb_exit(vo_driver_t *this_gen) { syncfb_driver_t *this = (syncfb_driver_t *) this_gen; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index a7db5251f..3f598f6d3 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_vidix.c,v 1.13 2002/11/04 22:48:14 f1rmb Exp $ + * $Id: video_out_vidix.c,v 1.14 2002/11/20 11:57:48 mroi Exp $ * * video_out_vidix.c * @@ -65,7 +65,7 @@ typedef struct vidix_frame_s { struct vidix_driver_s { - xine_vo_driver_t vo_driver; + vo_driver_t vo_driver; config_values_t *config; @@ -287,7 +287,7 @@ static void write_frame_sfb(vidix_driver_t* this, vidix_frame_t* frame) } -static uint32_t vidix_get_capabilities (xine_vo_driver_t *this_gen) { +static uint32_t vidix_get_capabilities (vo_driver_t *this_gen) { vidix_driver_t *this = (vidix_driver_t *) this_gen; @@ -306,7 +306,7 @@ static void vidix_frame_dispose (vo_frame_t *vo_img) { free (frame); } -static vo_frame_t *vidix_alloc_frame (xine_vo_driver_t *this_gen) { +static vo_frame_t *vidix_alloc_frame (vo_driver_t *this_gen) { vidix_frame_t *frame ; @@ -424,7 +424,7 @@ static void vidix_compute_output_size (vidix_driver_t *this) { this->vidix_started = 1; } -static void vidix_update_frame_format (xine_vo_driver_t *this_gen, +static void vidix_update_frame_format (vo_driver_t *this_gen, vo_frame_t *frame_gen, uint32_t width, uint32_t height, int ratio_code, int format, int flags) { @@ -479,7 +479,7 @@ static void vidix_update_frame_format (xine_vo_driver_t *this_gen, /* * */ -static void vidix_overlay_blend (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { +static void vidix_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { vidix_frame_t *frame = (vidix_frame_t *) frame_gen; @@ -491,7 +491,7 @@ static void vidix_overlay_blend (xine_vo_driver_t *this_gen, vo_frame_t *frame_g } } -static int vidix_redraw_needed (xine_vo_driver_t *this_gen) { +static int vidix_redraw_needed (vo_driver_t *this_gen) { vidix_driver_t *this = (vidix_driver_t *) this_gen; int ret = 0; @@ -507,7 +507,7 @@ static int vidix_redraw_needed (xine_vo_driver_t *this_gen) { } -static void vidix_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen) { +static void vidix_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { vidix_driver_t *this = (vidix_driver_t *) this_gen; vidix_frame_t *frame = (vidix_frame_t *) frame_gen; @@ -544,7 +544,7 @@ static void vidix_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_g pthread_mutex_unlock(&this->mutex); } -static int vidix_get_property (xine_vo_driver_t *this_gen, int property) { +static int vidix_get_property (vo_driver_t *this_gen, int property) { vidix_driver_t *this = (vidix_driver_t *) this_gen; @@ -561,7 +561,7 @@ static int vidix_get_property (xine_vo_driver_t *this_gen, int property) { } -static int vidix_set_property (xine_vo_driver_t *this_gen, +static int vidix_set_property (vo_driver_t *this_gen, int property, int value) { vidix_driver_t *this = (vidix_driver_t *) this_gen; @@ -600,7 +600,7 @@ static int vidix_set_property (xine_vo_driver_t *this_gen, return value; } -static void vidix_get_property_min_max (xine_vo_driver_t *this_gen, +static void vidix_get_property_min_max (vo_driver_t *this_gen, int property, int *min, int *max) { /* vidix_driver_t *this = (vidix_driver_t *) this_gen; */ @@ -611,7 +611,7 @@ static void vidix_get_property_min_max (xine_vo_driver_t *this_gen, } } -static int vidix_gui_data_exchange (xine_vo_driver_t *this_gen, +static int vidix_gui_data_exchange (vo_driver_t *this_gen, int data_type, void *data) { int ret = 0; @@ -659,7 +659,7 @@ static int vidix_gui_data_exchange (xine_vo_driver_t *this_gen, return ret; } -static void vidix_exit (xine_vo_driver_t *this_gen) { +static void vidix_exit (vo_driver_t *this_gen) { vidix_driver_t *this = (vidix_driver_t *) this_gen; @@ -669,7 +669,7 @@ static void vidix_exit (xine_vo_driver_t *this_gen) { vdlClose(this->vidix_handler); } -static xine_vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) { +static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) { vidix_class_t *class = (vidix_class_t *) class_gen; config_values_t *config = class->config; vidix_driver_t *this; @@ -796,6 +796,6 @@ static vo_info_t vo_info_vidix = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 10, "vidix", XINE_VERSION_CODE, &vo_info_vidix, init_class }, + { PLUGIN_VIDEO_OUT, 11, "vidix", XINE_VERSION_CODE, &vo_info_vidix, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index be8413185..291918f6a 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_xshm.c,v 1.94 2002/10/22 16:42:25 jkeil Exp $ + * $Id: video_out_xshm.c,v 1.95 2002/11/20 11:57:49 mroi Exp $ * * video_out_xshm.c, X11 shared memory extension interface for xine * @@ -90,7 +90,7 @@ typedef struct xshm_frame_s { typedef struct xshm_driver_s { - xine_vo_driver_t vo_driver; + vo_driver_t vo_driver; /* X11 / XShm related stuff */ Display *display; @@ -300,7 +300,7 @@ static void dispose_ximage (xshm_driver_t *this, * and now, the driver functions */ -static uint32_t xshm_get_capabilities (xine_vo_driver_t *this_gen) { +static uint32_t xshm_get_capabilities (vo_driver_t *this_gen) { return VO_CAP_COPIES_IMAGE | VO_CAP_YV12 | VO_CAP_YUY2 | VO_CAP_BRIGHTNESS; } @@ -376,7 +376,7 @@ static void xshm_frame_dispose (vo_frame_t *vo_img) { } -static vo_frame_t *xshm_alloc_frame (xine_vo_driver_t *this_gen) { +static vo_frame_t *xshm_alloc_frame (vo_driver_t *this_gen) { xshm_frame_t *frame ; xshm_driver_t *this = (xshm_driver_t *) this_gen; @@ -441,7 +441,7 @@ static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) { #endif } -static void xshm_update_frame_format (xine_vo_driver_t *this_gen, +static void xshm_update_frame_format (vo_driver_t *this_gen, vo_frame_t *frame_gen, uint32_t width, uint32_t height, int ratio_code, int format, int flags) { @@ -623,7 +623,7 @@ static void xshm_overlay_clut_yuv2rgb(xshm_driver_t *this, vo_overlay_t *overla } } -static void xshm_overlay_blend (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { +static void xshm_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { xshm_driver_t *this = (xshm_driver_t *) this_gen; xshm_frame_t *frame = (xshm_frame_t *) frame_gen; @@ -676,7 +676,7 @@ static void clean_output_area (xshm_driver_t *this, xshm_frame_t *frame) { XUnlockDisplay (this->display); } -static int xshm_redraw_needed (xine_vo_driver_t *this_gen) { +static int xshm_redraw_needed (vo_driver_t *this_gen) { xshm_driver_t *this = (xshm_driver_t *) this_gen; int ret = 0; @@ -697,7 +697,7 @@ static int xshm_redraw_needed (xine_vo_driver_t *this_gen) { return ret; } -static void xshm_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen) { +static void xshm_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { xshm_driver_t *this = (xshm_driver_t *) this_gen; xshm_frame_t *frame = (xshm_frame_t *) frame_gen; @@ -788,7 +788,7 @@ static void xshm_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_ge #endif } -static int xshm_get_property (xine_vo_driver_t *this_gen, int property) { +static int xshm_get_property (vo_driver_t *this_gen, int property) { xshm_driver_t *this = (xshm_driver_t *) this_gen; @@ -807,7 +807,7 @@ static int xshm_get_property (xine_vo_driver_t *this_gen, int property) { return 0; } -static int xshm_set_property (xine_vo_driver_t *this_gen, +static int xshm_set_property (vo_driver_t *this_gen, int property, int value) { xshm_driver_t *this = (xshm_driver_t *) this_gen; @@ -836,7 +836,7 @@ static int xshm_set_property (xine_vo_driver_t *this_gen, return value; } -static void xshm_get_property_min_max (xine_vo_driver_t *this_gen, +static void xshm_get_property_min_max (vo_driver_t *this_gen, int property, int *min, int *max) { /* xshm_driver_t *this = (xshm_driver_t *) this_gen; */ @@ -849,7 +849,7 @@ static void xshm_get_property_min_max (xine_vo_driver_t *this_gen, } } -static int xshm_gui_data_exchange (xine_vo_driver_t *this_gen, +static int xshm_gui_data_exchange (vo_driver_t *this_gen, int data_type, void *data) { xshm_driver_t *this = (xshm_driver_t *) this_gen; @@ -959,7 +959,7 @@ static int xshm_gui_data_exchange (xine_vo_driver_t *this_gen, return 0; } -static void xshm_dispose (xine_vo_driver_t *this_gen) { +static void xshm_dispose (vo_driver_t *this_gen) { xshm_driver_t *this = (xshm_driver_t *) this_gen; @@ -1026,7 +1026,7 @@ static char *visual_class_name(Visual *visual) { } -static xine_vo_driver_t *xshm_open_plugin (video_driver_class_t *class_gen, const void *visual_gen) +static vo_driver_t *xshm_open_plugin (video_driver_class_t *class_gen, const void *visual_gen) { xshm_class_t *class = (xshm_class_t *) class_gen; config_values_t *config = class->config; @@ -1265,6 +1265,6 @@ static vo_info_t vo_info_xshm = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 10, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, + { PLUGIN_VIDEO_OUT, 11, "xshm", XINE_VERSION_CODE, &vo_info_xshm, xshm_init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index bed8eb06e..ef4e04a6e 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out_xv.c,v 1.149 2002/11/10 20:35:50 storri Exp $ + * $Id: video_out_xv.c,v 1.150 2002/11/20 11:57:49 mroi Exp $ * * video_out_xv.c, X11 video extension interface for xine * @@ -98,7 +98,7 @@ typedef struct { struct xv_driver_s { - xine_vo_driver_t vo_driver; + vo_driver_t vo_driver; config_values_t *config; @@ -145,7 +145,7 @@ typedef struct { int gX11Fail; -static uint32_t xv_get_capabilities (xine_vo_driver_t *this_gen) { +static uint32_t xv_get_capabilities (vo_driver_t *this_gen) { xv_driver_t *this = (xv_driver_t *) this_gen; @@ -182,7 +182,7 @@ static void xv_frame_dispose (vo_frame_t *vo_img) { free (frame); } -static vo_frame_t *xv_alloc_frame (xine_vo_driver_t *this_gen) { +static vo_frame_t *xv_alloc_frame (vo_driver_t *this_gen) { xv_frame_t *frame ; @@ -382,7 +382,7 @@ static void dispose_ximage (xv_driver_t *this, } } -static void xv_update_frame_format (xine_vo_driver_t *this_gen, +static void xv_update_frame_format (vo_driver_t *this_gen, vo_frame_t *frame_gen, uint32_t width, uint32_t height, int ratio_code, int format, int flags) { @@ -577,7 +577,7 @@ static void xv_compute_output_size (xv_driver_t *this) { } } -static void xv_overlay_blend (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { +static void xv_overlay_blend (vo_driver_t *this_gen, vo_frame_t *frame_gen, vo_overlay_t *overlay) { xv_frame_t *frame = (xv_frame_t *) frame_gen; @@ -623,7 +623,7 @@ static void xv_flush_recent_frames (xv_driver_t *this) { } #endif -static int xv_redraw_needed (xine_vo_driver_t *this_gen) { +static int xv_redraw_needed (vo_driver_t *this_gen) { xv_driver_t *this = (xv_driver_t *) this_gen; int ret = 0; @@ -650,7 +650,7 @@ static int xv_redraw_needed (xine_vo_driver_t *this_gen) { return ret; } -static void xv_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen) { +static void xv_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { xv_driver_t *this = (xv_driver_t *) this_gen; xv_frame_t *frame = (xv_frame_t *) frame_gen; @@ -735,7 +735,7 @@ static void xv_display_frame (xine_vo_driver_t *this_gen, vo_frame_t *frame_gen) */ } -static int xv_get_property (xine_vo_driver_t *this_gen, int property) { +static int xv_get_property (vo_driver_t *this_gen, int property) { xv_driver_t *this = (xv_driver_t *) this_gen; @@ -756,7 +756,7 @@ static void xv_property_callback (void *property_gen, xine_cfg_entry_t *entry) { } -static int xv_set_property (xine_vo_driver_t *this_gen, +static int xv_set_property (vo_driver_t *this_gen, int property, int value) { xv_driver_t *this = (xv_driver_t *) this_gen; @@ -833,7 +833,7 @@ static int xv_set_property (xine_vo_driver_t *this_gen, return value; } -static void xv_get_property_min_max (xine_vo_driver_t *this_gen, +static void xv_get_property_min_max (vo_driver_t *this_gen, int property, int *min, int *max) { xv_driver_t *this = (xv_driver_t *) this_gen; @@ -842,7 +842,7 @@ static void xv_get_property_min_max (xine_vo_driver_t *this_gen, *max = this->props[property].max; } -static int xv_gui_data_exchange (xine_vo_driver_t *this_gen, +static int xv_gui_data_exchange (vo_driver_t *this_gen, int data_type, void *data) { xv_driver_t *this = (xv_driver_t *) this_gen; @@ -940,7 +940,7 @@ static int xv_gui_data_exchange (xine_vo_driver_t *this_gen, return 0; } -static void xv_dispose (xine_vo_driver_t *this_gen) { +static void xv_dispose (vo_driver_t *this_gen) { xv_driver_t *this = (xv_driver_t *) this_gen; int i; @@ -1074,7 +1074,7 @@ static void xv_update_XV_DOUBLE_BUFFER(void *this_gen, xine_cfg_entry_t *entry) } -static xine_vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) { +static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) { xv_class_t *class = (xv_class_t *) class_gen; config_values_t *config = class->config; @@ -1388,7 +1388,7 @@ static vo_info_t vo_info_xv = { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_VIDEO_OUT, 10, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, + { PLUGIN_VIDEO_OUT, 11, "xv", XINE_VERSION_CODE, &vo_info_xv, init_class }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; |