[xine-cvs] CVS: xine-lib/src/video_out video_out_sdl.c,1.35,1.36

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib/src/video_out
In directory sc8-pr-cvs1:/tmp/cvs-serv8839

Modified Files:
	video_out_sdl.c 
Log Message:
obvious fix to make sdl work again.
to keep the tradition it looks like redhat is shipping broken
SDL libs again. mine (RH9) only works with hw_accel=0.


Index: video_out_sdl.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/video_out/video_out_sdl.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- video_out_sdl.c	14 Dec 2003 22:13:25 -0000	1.35
+++ video_out_sdl.c	29 Dec 2003 18:07:49 -0000	1.36
@@ -85,6 +85,8 @@
   vo_driver_t        vo_driver;
 
   config_values_t   *config;
+  
+  int                hw_accel;
 
   SDL_Surface       *surface;
   uint32_t           sdlflags;
@@ -100,7 +102,7 @@
   int                screen;
   Drawable           drawable;
 #endif
-
+  
   vo_scale_t         sc;
   xine_t            *xine;
 };
@@ -459,14 +461,18 @@
   x11_visual_t         *visual = (x11_visual_t *) visual_gen;
   XWindowAttributes     window_attributes;
 #endif
-
+  
   this = (sdl_driver_t *) xine_xmalloc (sizeof (sdl_driver_t));
-  if (this)
+  if (!this)
     return NULL;
 
   this->sdlflags = SDL_HWSURFACE | SDL_RESIZABLE;
+  
+  this->hw_accel = class->config->register_bool(class->config, 
+    "video.sdl_hw_accel", 1, "use hardware acceleration if available",
+    NULL, 10, NULL, this);
 
-  xine_setenv("SDL_VIDEO_YUV_HWACCEL", "1", 1);
+  xine_setenv("SDL_VIDEO_YUV_HWACCEL", (this->hw_accel) ? "1" : "0", 1);
   xine_setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "1", 1);
 
   this->xine              = class->xine;
@@ -540,6 +546,7 @@
   this->vo_driver.redraw_needed        = sdl_redraw_needed;
 
   xprintf (this->xine, XINE_VERBOSITY_DEBUG, "video_out_sdl: warning, xine's SDL driver is EXPERIMENTAL\n");
+  xprintf (this->xine, XINE_VERBOSITY_DEBUG, "video_out_sdl: in case of trouble, try setting video.sdl_hw_accel=0\n");
   xprintf (this->xine, XINE_VERBOSITY_LOG, _("video_out_sdl: fullscreen mode is NOT supported\n"));
   return &this->vo_driver;
 }