1 files changed, 83 insertions, 83 deletions

diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c
index b88f10c11..3216950e8 100644
--- a/src/xine-engine/video_overlay.c
+++ b/src/xine-engine/video_overlay.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2000-2006 the xine project
- * 
+ *
  * This file is part of xine, a free video player.
- * 
+ *
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
@@ -51,15 +51,15 @@ typedef struct video_overlay_showing_s {
 
 typedef struct video_overlay_s {
   video_overlay_manager_t   video_overlay;
-  
+
   xine_t                   *xine;
 
-  pthread_mutex_t           events_mutex;  
+  pthread_mutex_t           events_mutex;
   video_overlay_events_t    events[MAX_EVENTS];
-  pthread_mutex_t           objects_mutex;  
+  pthread_mutex_t           objects_mutex;
   video_overlay_object_t    objects[MAX_OBJECTS];
   pthread_mutex_t           showing_mutex;
-  video_overlay_showing_t   showing[MAX_SHOWING];  
+  video_overlay_showing_t   showing[MAX_SHOWING];
   int                       showing_changed;
 } video_overlay_t;
 
@@ -67,24 +67,24 @@ typedef struct video_overlay_s {
 static void add_showing_handle( video_overlay_t *this, int32_t handle )
 {
   int i;
-  
+
   pthread_mutex_lock( &this->showing_mutex );
   this->showing_changed++;
-  
+
   for( i = 0; i < MAX_SHOWING; i++ )
     if( this->showing[i].handle == handle )
       break; /* already showing */
-   
+
   if( i == MAX_SHOWING ) {
     for( i = 0; i < MAX_SHOWING && this->showing[i].handle >= 0; i++ )
       ;
-        
+
     if( i != MAX_SHOWING )
       this->showing[i].handle = handle;
     else
       xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video_overlay: error: no showing slots available\n");
   }
-  
+
   pthread_mutex_unlock( &this->showing_mutex );
 }
 
@@ -94,13 +94,13 @@ static void remove_showing_handle( video_overlay_t *this, int32_t handle )
 
   pthread_mutex_lock( &this->showing_mutex );
   this->showing_changed++;
-  
+
   for( i = 0; i < MAX_SHOWING; i++ ) {
     if( this->showing[i].handle == handle ) {
       this->showing[i].handle = -1;
     }
   }
-  
+
   pthread_mutex_unlock( &this->showing_mutex );
 }
 
@@ -110,34 +110,34 @@ static void remove_events_handle( video_overlay_t *this, int32_t handle, int loc
 
   if( lock )
     pthread_mutex_lock( &this->events_mutex );
-  
+
   this_event=0;
   do {
     last_event=this_event;
     this_event=this->events[last_event].next_event;
-  
-    while( this_event && 
+
+    while( this_event &&
         this->events[this_event].event->object.handle == handle ) {
       /* remove event from pts list */
       this->events[last_event].next_event=
         this->events[this_event].next_event;
 
-      /* free its overlay */ 
-      if( this->events[this_event].event->object.overlay ) {   
+      /* free its overlay */
+      if( this->events[this_event].event->object.overlay ) {
         if( this->events[this_event].event->object.overlay->rle )
           free( this->events[this_event].event->object.overlay->rle );
         free(this->events[this_event].event->object.overlay);
         this->events[this_event].event->object.overlay = NULL;
       }
-      
+
       /* mark as free */
       this->events[this_event].next_event = 0;
       this->events[this_event].event->event_type = OVERLAY_EVENT_NULL;
-      
+
       this_event=this->events[last_event].next_event;
     }
   } while ( this_event );
- 
+
   if( lock )
     pthread_mutex_unlock( &this->events_mutex );
 }
@@ -149,35 +149,35 @@ static void remove_events_handle( video_overlay_t *this, int32_t handle, int loc
 static int32_t video_overlay_get_handle(video_overlay_manager_t *this_gen, int object_type ) {
   video_overlay_t *this = (video_overlay_t *) this_gen;
   int n;
-  
+
   pthread_mutex_lock( &this->objects_mutex );
-  
+
   for( n=0; n < MAX_OBJECTS && this->objects[n].handle > -1; n++ )
     ;
-  
+
   if (n == MAX_OBJECTS) {
     n = -1;
   } else {
     this->objects[n].handle = n;
     this->objects[n].object_type = object_type;
   }
-  
+
   pthread_mutex_unlock( &this->objects_mutex );
   return n;
 }
 
-/* 
+/*
   free a handle from the object pool (internal function)
  */
 static void internal_video_overlay_free_handle(video_overlay_t *this, int32_t handle) {
-    
+
   pthread_mutex_lock( &this->objects_mutex );
 
   if( this->objects[handle].overlay ) {
     if( this->objects[handle].overlay->rle )
       free( this->objects[handle].overlay->rle );
     free( this->objects[handle].overlay );
-    this->objects[handle].overlay = NULL; 
+    this->objects[handle].overlay = NULL;
   }
   this->objects[handle].handle = -1;
 
@@ -199,7 +199,7 @@ static void video_overlay_free_handle(video_overlay_manager_t *this_gen, int32_t
 
 static void video_overlay_reset (video_overlay_t *this) {
   int i;
-  
+
   pthread_mutex_lock (&this->events_mutex);
   for (i=0; i < MAX_EVENTS; i++) {
     if (this->events[i].event == NULL) {
@@ -212,17 +212,17 @@ static void video_overlay_reset (video_overlay_t *this) {
 #endif
     }
     this->events[i].event->event_type = 0;  /* Empty slot */
-    this->events[i].next_event = 0;    
+    this->events[i].next_event = 0;
   }
   pthread_mutex_unlock (&this->events_mutex);
-  
+
   for( i = 0; i < MAX_SHOWING; i++ )
     this->showing[i].handle = -1;
-  
+
   for (i=0; i < MAX_OBJECTS; i++) {
     internal_video_overlay_free_handle(this, i);
   }
-   
+
   this->showing_changed = 0;
 }
 
@@ -234,7 +234,7 @@ static void video_overlay_init (video_overlay_manager_t *this_gen) {
   pthread_mutex_init (&this->events_mutex,NULL);
   pthread_mutex_init (&this->objects_mutex,NULL);
   pthread_mutex_init (&this->showing_mutex,NULL);
-  
+
   video_overlay_reset(this);
 }
 
@@ -256,13 +256,13 @@ static int32_t video_overlay_add_event(video_overlay_manager_t *this_gen,  void
   uint32_t   last_event,this_event,new_event;
 
   pthread_mutex_lock (&this->events_mutex);
-  
+
   /* We skip the 0 entry because that is used as a pointer to the first event.*/
   /* Find a free event slot */
-  for( new_event = 1; new_event<MAX_EVENTS && 
+  for( new_event = 1; new_event<MAX_EVENTS &&
        this->events[new_event].event->event_type > 0; new_event++ )
     ;
-  
+
   if (new_event < MAX_EVENTS) {
     /* Find position in event queue to be added. */
     this_event=0;
@@ -274,7 +274,7 @@ static int32_t video_overlay_add_event(video_overlay_manager_t *this_gen,  void
 
     this->events[last_event].next_event=new_event;
     this->events[new_event].next_event=this_event;
-    
+
     /* memcpy everything except the actual image */
     if ( this->events[new_event].event == NULL ) {
       xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video_overlay: error: event slot is NULL!\n");
@@ -287,7 +287,7 @@ static int32_t video_overlay_add_event(video_overlay_manager_t *this_gen,  void
     if ( this->events[new_event].event->object.overlay ) {
       xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video_overlay: add_event: event->object.overlay was not freed!\n");
     }
-    
+
     if( event->object.overlay ) {
       int i;
       for(i = 0; i < OVL_PALETTE_SIZE; i++) {
@@ -298,7 +298,7 @@ static int32_t video_overlay_add_event(video_overlay_manager_t *this_gen,  void
       }
 
       this->events[new_event].event->object.overlay = calloc(1, sizeof(vo_overlay_t));
-      xine_fast_memcpy(this->events[new_event].event->object.overlay, 
+      xine_fast_memcpy(this->events[new_event].event->object.overlay,
            event->object.overlay, sizeof(vo_overlay_t));
 
       /* We took the callers rle and data, therefore it will be our job to free it */
@@ -311,9 +311,9 @@ static int32_t video_overlay_add_event(video_overlay_manager_t *this_gen,  void
     xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video_overlay:No spare subtitle event slots\n");
     new_event = -1;
   }
-  
+
   pthread_mutex_unlock (&this->events_mutex);
-   
+
   return new_event;
 }
 
@@ -335,7 +335,7 @@ static void video_overlay_print_overlay( vo_overlay_t *ovl ) {
   printf ("video_overlay: \thili_trans [%d %d %d %d]\n",
 	  ovl->hili_trans[0], ovl->hili_trans[1], ovl->hili_trans[2], ovl->hili_trans[3]);
   return;
-} 
+}
 #endif
 
 /*
@@ -347,9 +347,9 @@ static int video_overlay_event( video_overlay_t *this, int64_t vpts ) {
   int32_t      handle;
   uint32_t     this_event;
   int          processed = 0;
-  
+
   pthread_mutex_lock (&this->events_mutex);
-  
+
   this_event=this->events[0].next_event;
   while ( this_event && (vpts > this->events[this_event].event->vpts ||
           vpts == 0) ) {
@@ -375,21 +375,21 @@ static int video_overlay_event( video_overlay_t *this, int64_t vpts ) {
            */
           remove_showing_handle(this,handle);
           internal_video_overlay_free_handle(this, handle);
-          
+
           this->objects[handle].handle = handle;
           if( this->objects[handle].overlay ) {
             xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video_overlay: error: object->overlay was not freed!\n");
           }
-          this->objects[handle].overlay = 
+          this->objects[handle].overlay =
              this->events[this_event].event->object.overlay;
-          this->objects[handle].pts = 
+          this->objects[handle].pts =
              this->events[this_event].event->object.pts;
           this->events[this_event].event->object.overlay = NULL;
-        
+
           add_showing_handle( this, handle );
         }
         break;
-      
+
       case OVERLAY_EVENT_HIDE:
 #ifdef LOG_DEBUG
         printf ("video_overlay: HIDE SPU NOW\n");
@@ -399,17 +399,17 @@ static int video_overlay_event( video_overlay_t *this, int64_t vpts ) {
           if( this->events[this_event].event->object.overlay->rle != NULL )
             free( this->events[this_event].event->object.overlay->rle );
           free(this->events[this_event].event->object.overlay);
-          this->events[this_event].event->object.overlay = NULL; 
+          this->events[this_event].event->object.overlay = NULL;
         }
         remove_showing_handle( this, handle );
         break;
-      
+
       case OVERLAY_EVENT_FREE_HANDLE:
 #ifdef LOG_DEBUG
         printf ("video_overlay: FREE SPU NOW\n");
 #endif
         /* free any overlay associated with this event */
-        if( this->events[this_event].event->object.overlay != NULL) {   
+        if( this->events[this_event].event->object.overlay != NULL) {
           if( this->events[this_event].event->object.overlay->rle != NULL )
             free( this->events[this_event].event->object.overlay->rle );
           free(this->events[this_event].event->object.overlay);
@@ -423,7 +423,7 @@ static int video_overlay_event( video_overlay_t *this, int64_t vpts ) {
         internal_video_overlay_free_handle( this, handle );
         break;
 
- 
+
       case OVERLAY_EVENT_MENU_BUTTON:
         /* mixes palette and copy clip coords */
 #ifdef LOG_DEBUG
@@ -433,10 +433,10 @@ static int video_overlay_event( video_overlay_t *this, int64_t vpts ) {
         /* This code drops buttons, where the button PTS derived from the NAV
 	 * packet on DVDs does not match the SPU PTS. Practical experience shows,
 	 * that this is not necessary and causes problems with some DVDs */
-        if ( (this->events[this_event].event->object.pts != 
+        if ( (this->events[this_event].event->object.pts !=
                 this->objects[handle].pts) ) {
-          xprintf (this->xine, XINE_VERBOSITY_DEBUG, 
-		   "video_overlay:MENU BUTTON DROPPED menu pts=%lld spu pts=%lld\n",      
+          xprintf (this->xine, XINE_VERBOSITY_DEBUG,
+		   "video_overlay:MENU BUTTON DROPPED menu pts=%lld spu pts=%lld\n",
             this->events[this_event].event->object.pts,
             this->objects[handle].pts);
           break;
@@ -446,7 +446,7 @@ static int video_overlay_event( video_overlay_t *this, int64_t vpts ) {
              (this->objects[handle].overlay) ) {
           vo_overlay_t *overlay = this->objects[handle].overlay;
           vo_overlay_t *event_overlay = this->events[this_event].event->object.overlay;
-          
+
 #ifdef LOG_DEBUG
           printf ("video_overlay:overlay present\n");
 #endif
@@ -477,84 +477,84 @@ static int video_overlay_event( video_overlay_t *this, int64_t vpts ) {
           free( this->events[this_event].event->object.overlay->rle );
           this->events[this_event].event->object.overlay->rle = NULL;
         }
-            
+
         if (this->events[this_event].event->object.overlay != NULL) {
           free (this->events[this_event].event->object.overlay);
           this->events[this_event].event->object.overlay = NULL;
         }
         break;
-  
+
       default:
         xprintf (this->xine, XINE_VERBOSITY_DEBUG, "video_overlay: unhandled event type\n");
         break;
     }
-    
-    this->events[0].next_event = this->events[this_event].next_event;    
+
+    this->events[0].next_event = this->events[this_event].next_event;
     this->events[this_event].next_event = 0;
     this->events[this_event].event->event_type = 0;
-  
+
     this_event=this->events[0].next_event;
   }
-  
+
   pthread_mutex_unlock (&this->events_mutex);
 
   return processed;
 }
-  
-/* This is called from video_out.c 
+
+/* This is called from video_out.c
  * must call output->overlay_blend for each active overlay.
  */
-static void video_overlay_multiple_overlay_blend (video_overlay_manager_t *this_gen, int64_t vpts, 
+static void video_overlay_multiple_overlay_blend (video_overlay_manager_t *this_gen, int64_t vpts,
 						  vo_driver_t *output, vo_frame_t *vo_img, int enabled) {
   video_overlay_t *this = (video_overlay_t *) this_gen;
   int i;
   int32_t  handle;
 
-  /* Look at next events, if current video vpts > first event on queue, process the event 
-   * else just continue 
+  /* Look at next events, if current video vpts > first event on queue, process the event
+   * else just continue
    */
   video_overlay_event( this, vpts );
-  
-  /* Scan through 5 entries and display any present. 
+
+  /* Scan through 5 entries and display any present.
    */
   pthread_mutex_lock( &this->showing_mutex );
 
   if( output->overlay_begin )
     output->overlay_begin(output, vo_img, this->showing_changed);
-  
+
   for( i = 0; enabled && output->overlay_blend && i < MAX_SHOWING; i++ ) {
-    handle=this->showing[i].handle; 
+    handle=this->showing[i].handle;
     if (handle >= 0 ) {
       output->overlay_blend(output, vo_img, this->objects[handle].overlay);
     }
   }
-  
+
   if( output->overlay_end )
     output->overlay_end(output, vo_img);
-  
+
   this->showing_changed = 0;
-  
+
   pthread_mutex_unlock( &this->showing_mutex );
 }
 
 
-/* this should be called on stream end or stop to make sure every 
+/* this should be called on stream end or stop to make sure every
    hide event is processed.
 */
 static void video_overlay_flush_events(video_overlay_manager_t *this_gen )
 {
   video_overlay_t *this = (video_overlay_t *) this_gen;
-  
+
   video_overlay_event( this, 0 );
 }
 
-/* this is called from video_out.c on still frames to check 
+/* this is called from video_out.c on still frames to check
    if a redraw is needed.
 */
 static int video_overlay_redraw_needed(video_overlay_manager_t *this_gen, int64_t vpts )
 {
   video_overlay_t *this = (video_overlay_t *) this_gen;
-  
+
   video_overlay_event( this, vpts );
   return this->showing_changed;
 }
@@ -575,7 +575,7 @@ static void video_overlay_dispose(video_overlay_manager_t *this_gen) {
       free (this->events[i].event);
     }
   }
-  
+
   for (i=0; i < MAX_OBJECTS; i++)
     internal_video_overlay_free_handle(this, i);