From 4e95a4f5224e241075b8cd86b4423c85c1d0ee26 Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Wed, 20 Nov 2002 11:57:38 +0000 Subject: 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 --- src/video_out/video_out_syncfb.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/video_out/video_out_syncfb.c') 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; -- cgit v1.2.3