fix sdl

CVS patchset: 3503
CVS date: 2002/12/13 00:20:11

2 files changed, 9 insertions, 19 deletions

diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index fc8f56f50..51fb6a30a 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -45,9 +45,9 @@ endif
 #directfb_module = xineplug_vo_out_directfb.la
 #endif
 
-#if HAVE_SDL
-#sdl_module = xineplug_vo_out_sdl.la
-#endif
+if HAVE_SDL
+sdl_module = xineplug_vo_out_sdl.la
+endif
 
 
 
@@ -59,7 +59,7 @@ endif
 #lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(directfb_module)  \
 #                  $(syncfb_module) $(fb_module) $(opengl_module) $(sdl_module) $(vidix_module)
 lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module) $(pgx64_module) \
-	$(vidix_module) $(fb_module) \
+	$(vidix_module) $(fb_module) $(sdl_module) \
 	xineplug_vo_out_none.la
 XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
 
@@ -101,9 +101,9 @@ xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 #xineplug_vo_out_directfb_la_LIBADD = $(DIRECTFB_LIBS)
 #xineplug_vo_out_directfb_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
-#xineplug_vo_out_sdl_la_SOURCES = alphablend.c video_out_sdl.c
-#xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS)
-#xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+xineplug_vo_out_sdl_la_SOURCES = alphablend.c video_out_sdl.c
+xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS)
+xineplug_vo_out_sdl_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 xineplug_vo_out_vidix_la_SOURCES = alphablend.c video_out_vidix.c
 xineplug_vo_out_vidix_la_LIBADD =  $(X_LIBS) $(top_builddir)/src/video_out/vidix/libvidix.la
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 58459a696..c8bf3732f 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.17 2002/12/06 01:33:01 miguelfreitas Exp $
+ * $Id: video_out_sdl.c,v 1.18 2002/12/13 00:20:11 miguelfreitas Exp $
  *
  * video_out_sdl.c, Simple DirectMedia Layer
  *
@@ -449,8 +449,6 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   XWindowAttributes     window_attributes;
 #endif
 
-  printf ("video_out_sdl: open_plugin\n");
-
   this = malloc (sizeof (sdl_driver_t));
 
   if (!this) {
@@ -470,16 +468,13 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   this->screen            = visual->screen;
   this->drawable          = visual->d;
 
-  printf("video_out_sdl: open_plugin - vo_scale_init\n");
   vo_scale_init( &this->sc, 0, 0, config);
   this->sc.frame_output_cb   = visual->frame_output_cb;
   this->sc.user_data         = visual->user_data;
 
-
   /* set SDL to use our existing X11 window */
   sprintf(SDL_windowhack,"SDL_WINDOWID=0x%x", (uint32_t) this->drawable );
   putenv(SDL_windowhack);
-  printf("video_out_sdl: open_plugin - set SDL to use our existing X11 window\n");
 #else
   vo_scale_init( &this->sc, 0, 0, config );
 #endif
@@ -489,20 +484,15 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
     printf ("video_out_sdl: open_plugin - sdl video initialization failed.\n");
     return NULL;
   }
-  printf("video_out_sdl: open_plugin - sdl video initialization success\n");
 
   vidInfo = SDL_GetVideoInfo ();
   if (!SDL_ListModes (vidInfo->vfmt, SDL_HWSURFACE | SDL_RESIZABLE)) {
     this->sdlflags = SDL_RESIZABLE;
     if (!SDL_ListModes (vidInfo->vfmt, SDL_RESIZABLE)) {
-      fprintf (stderr, "video_out_sdl: open_plugin - sdl couldn't get any acceptable video mode\n");
+      printf ("video_out_sdl: open_plugin - sdl couldn't get any acceptable video mode\n");
       return NULL;
     }
   }
-  printf("video_out_sdl: open_plugin - sdl found acceptable video mode\n");
-  this->surface = SDL_SetVideoMode (this->sc.gui_width, this->sc.gui_height,
-                                     this->bpp, this->sdlflags);
-  printf("video_out_sdl: open_plugin - sdl set video mode\n");
 
   this->bpp = vidInfo->vfmt->BitsPerPixel;
   if (this->bpp < 16) {