Work at SourceForge, help us to make it a better place! We have an immediate need for a Support Technician in our San Francisco or Denver office.

Close

Diff of /src/video_out/video_out_sdl.c [5286f8] .. [7cc4e1] Maximize Restore

  Switch to side-by-side view

--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -83,7 +83,7 @@
   vo_driver_t        vo_driver;
 
   config_values_t   *config;
-  
+
   int                hw_accel;
 
   SDL_Surface       *surface;
@@ -100,7 +100,7 @@
   int                screen;
   Drawable           drawable;
 #endif
-  
+
   vo_scale_t         sc;
   xine_t            *xine;
 
@@ -142,7 +142,7 @@
 
   if (!frame)
     return NULL;
-  
+
   pthread_mutex_init (&frame->vo_frame.mutex, NULL);
 
   /*
@@ -207,8 +207,8 @@
     if (frame->overlay == NULL)
       return;
 
-	/* 
-	 * This needs to be done becuase I have found that 
+	/*
+	 * This needs to be done becuase I have found that
 	 * pixels isn't setup until this is called.
 	 */
     SDL_LockYUVOverlay (frame->overlay);
@@ -242,7 +242,7 @@
 
   this->alphablend_extra_data.offset_x = frame_gen->overlay_offset_x;
   this->alphablend_extra_data.offset_y = frame_gen->overlay_offset_y;
-  
+
   if (overlay->rle) {
     if( frame->format == XINE_IMGFMT_YV12 )
       _x_blend_yuv( frame->vo_frame.base, overlay, frame->width, frame->height, frame->vo_frame.pitches, &this->alphablend_extra_data);
@@ -354,7 +354,7 @@
 static int sdl_get_property (vo_driver_t *this_gen, int property) {
 
   sdl_driver_t *this = (sdl_driver_t *) this_gen;
-  
+
   switch (property) {
     case VO_PROP_WINDOW_WIDTH:
       return this->sc.gui_width;
@@ -383,7 +383,7 @@
     if (value>=XINE_VO_ASPECT_NUM_RATIOS)
       value = XINE_VO_ASPECT_AUTO;
     this->sc.user_ratio = value;
-    xprintf(this->xine, XINE_VERBOSITY_DEBUG, 
+    xprintf(this->xine, XINE_VERBOSITY_DEBUG,
 	    "video_out_sdl: aspect ratio changed to %s\n", _x_vo_scale_aspect_ratio_name_table[value]);
 
     sdl_compute_ideal_size (this);
@@ -458,7 +458,7 @@
   SDL_QuitSubSystem (SDL_INIT_VIDEO);
 
   _x_alphablend_free(&this->alphablend_extra_data);
-  
+
   free(this);
 }
 
@@ -476,16 +476,16 @@
 #ifdef HAVE_X11
   XWindowAttributes     window_attributes;
 #endif
-  
+
   this = (sdl_driver_t *) calloc(1, sizeof(sdl_driver_t));
   if (!this)
     return NULL;
 
   _x_alphablend_init(&this->alphablend_extra_data, class->xine);
-  
+
   this->sdlflags = SDL_HWSURFACE | SDL_RESIZABLE;
-  
-  this->hw_accel = class->config->register_bool(class->config, 
+
+  this->hw_accel = class->config->register_bool(class->config,
     "video.device.sdl_hw_accel", 1,
     _("use hardware acceleration if available"),
     _("When your system supports it, hardware acceleration provided by your "
@@ -525,7 +525,7 @@
   if (!SDL_ListModes (vidInfo->vfmt, SDL_HWSURFACE | SDL_RESIZABLE)) {
     this->sdlflags = SDL_RESIZABLE;
     if (!SDL_ListModes (vidInfo->vfmt, SDL_RESIZABLE)) {
-      xprintf (this->xine, XINE_VERBOSITY_DEBUG, 
+      xprintf (this->xine, XINE_VERBOSITY_DEBUG,
 	       "video_out_sdl: open_plugin - sdl couldn't get any acceptable video mode\n");
       return NULL;
     }
@@ -533,7 +533,7 @@
 
   this->bpp = vidInfo->vfmt->BitsPerPixel;
   if (this->bpp < 16) {
-    xprintf(this->xine, XINE_VERBOSITY_LOG, 
+    xprintf(this->xine, XINE_VERBOSITY_LOG,
 	    _("sdl has to emulate a 16 bit surfaces, that will slow things down.\n"));
     this->bpp = 16;
   }
@@ -580,17 +580,17 @@
 static void *init_class (xine_t *xine, void *visual_gen) {
   /* x11_visual_t     *visual = (x11_visual_t *) visual_gen; */
   sdl_class_t      *this;
-  
+
   /* check if we have SDL */
   if ((SDL_Init (SDL_INIT_VIDEO)) < 0) {
-    xprintf (xine, XINE_VERBOSITY_DEBUG, 
+    xprintf (xine, XINE_VERBOSITY_DEBUG,
 	     "video_out_sdl: open_plugin - sdl video initialization failed.\n");
     return NULL;
   }
   SDL_QuitSubSystem (SDL_INIT_VIDEO);
 
   this = (sdl_class_t*) calloc(1, sizeof(sdl_class_t));
-   
+
   this->driver_class.open_plugin      = open_plugin;
   this->driver_class.identifier       = "SDL";
   this->driver_class.description      = N_("xine video output plugin using the Simple Direct Media Layer");