summaryrefslogtreecommitdiff
path: root/src/video_out/video_out_sdl.c
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2002-11-20 11:57:38 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2002-11-20 11:57:38 +0000
commit4e95a4f5224e241075b8cd86b4423c85c1d0ee26 (patch)
treecd9287e15591dce94560663ad66fc4005d006012 /src/video_out/video_out_sdl.c
parent74893748b868ecc6ae539fa66e326e06947c4ac9 (diff)
downloadxine-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/video_out_sdl.c')
-rw-r--r--src/video_out/video_out_sdl.c22
1 files changed, 11 insertions, 11 deletions
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;