Remove trailing whitespace from most files

26 files changed, 292 insertions, 297 deletions

diff --git a/gui/app.c b/gui/app.c
index 4d5c661d71..a389013c98 100644
--- a/gui/app.c
+++ b/gui/app.c
@@ -72,7 +72,7 @@ static const evName evNames[] =
   { evSetMoviePosition,  "evSetMoviePosition"  },
   { evSetVolume,         "evSetVolume"         },
   { evSetBalance,        "evSetBalance"        },
-  { evHelp,		 "evHelp"	       },	
+  { evHelp,		 "evHelp"	       },
   { evLoadSubtitle,      "evLoadSubtitle"      },
   { evPlayDVD,		 "evPlayDVD"	       },
   { evPlayVCD,		 "evPlayVCD"	       },
@@ -108,7 +108,7 @@ void appClearItem( wItem * item )
  item->tmp=0;
  item->key=0; item->key2=0;
  item->Bitmap.Width=0; item->Bitmap.Height=0; item->Bitmap.BPP=0; item->Bitmap.ImageSize=0;
- if ( item->Bitmap.Image ) free( item->Bitmap.Image ); 
+ if ( item->Bitmap.Image ) free( item->Bitmap.Image );
  item->Bitmap.Image=NULL;
 // ---
  item->fontid=0;
@@ -235,5 +235,5 @@ void btnSet( int event,int set )
     { appMPlayer.Items[j].pressed=set; appMPlayer.barItems[j].tmp=0; }
  for ( j=0;j<appMPlayer.NumberOfBarItems + 1;j++ )
    if ( appMPlayer.barItems[j].msg == event )
-    { appMPlayer.barItems[j].pressed=set; appMPlayer.barItems[j].tmp=0; } 
+    { appMPlayer.barItems[j].pressed=set; appMPlayer.barItems[j].tmp=0; }
 }
diff --git a/gui/app.h b/gui/app.h
index 51cf978c34..fd924ffcbc 100644
--- a/gui/app.h
+++ b/gui/app.h
@@ -150,7 +150,7 @@ typedef struct
  char     * label;
 // ---
  int        event;
-// --- 
+// ---
  int        R,G,B;
 } wItem;
 
@@ -166,7 +166,7 @@ typedef struct
  wItem           bar;
  wsTWindow       barWindow;
  int             barIsPresent;
-  
+
  wItem           menuBase;
  wItem           menuSelected;
  wsTWindow       menuWindow;
diff --git a/gui/bitmap.c b/gui/bitmap.c
index df937e06c5..6cf7d35d60 100644
--- a/gui/bitmap.c
+++ b/gui/bitmap.c
@@ -34,9 +34,9 @@ static int pngRead( unsigned char * fname,txSample * bf )
  int             len;
  AVCodecContext *avctx;
  AVFrame        *frame;
- 
+
  FILE *fp=fopen( fname,"rb" );
- if ( !fp ) 
+ if ( !fp )
   {
    mp_dbg( MSGT_GPLAYER,MSGL_DBG2,"[png] file read error ( %s )\n",fname );
    return 1;
@@ -108,10 +108,10 @@ static int conv24to32( txSample * bf )
 static void Normalize( txSample * bf )
 {
  int           i;
-#ifndef WORDS_BIGENDIAN 
+#ifndef WORDS_BIGENDIAN
  for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i+3]=0;
 #else
- for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i]=0; 
+ for ( i=0;i < (int)bf->ImageSize;i+=4 ) bf->Image[i]=0;
 #endif
 }
 
@@ -146,7 +146,7 @@ int bpRead( char * fname, txSample * bf )
 {
  fname=fExist( fname );
  if ( fname == NULL ) return -2;
- if ( pngRead( fname,bf ) ) 
+ if ( pngRead( fname,bf ) )
   {
    mp_dbg( MSGT_GPLAYER,MSGL_FATAL,"[bitmap] unknown file type ( %s )\n",fname );
    return -5;
diff --git a/gui/cfg.c b/gui/cfg.c
index 084a44c9f2..adb365415f 100644
--- a/gui/cfg.c
+++ b/gui/cfg.c
@@ -106,7 +106,7 @@ static m_config_t * gui_conf;
 static const m_option_t gui_opts[] =
 {
  { "enable_audio_equ",&gtkEnableAudioEqualizer,CONF_TYPE_FLAG,0,0,1,NULL },
- 
+
  { "vo_driver",&video_driver_list,CONF_TYPE_STRING_LIST,0,0,0,NULL },
  { "vo_panscan",&vo_panscan,CONF_TYPE_FLOAT,CONF_RANGE,0.0,1.0,NULL },
  { "vo_doublebuffering",&vo_doublebuffering,CONF_TYPE_FLAG,0,0,1,NULL },
@@ -153,7 +153,7 @@ static const m_option_t gui_opts[] =
 
  { "dvd_device",&dvd_device,CONF_TYPE_STRING,0,0,0,NULL },
  { "cdrom_device",&cdrom_device,CONF_TYPE_STRING,0,0,0,NULL },
- 
+
  { "osd_level",&osd_level,CONF_TYPE_INT,CONF_RANGE,0,3,NULL },
  { "sub_auto_load",&sub_auto,CONF_TYPE_FLAG,0,0,1,NULL },
  { "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL },
@@ -182,14 +182,14 @@ static const m_option_t gui_opts[] =
  { "cache",&gtkCacheOn,CONF_TYPE_FLAG,0,0,1,NULL },
  { "cache_size",&gtkCacheSize,CONF_TYPE_INT,CONF_RANGE,-1,65535,NULL },
 
- { "playbar",&gtkEnablePlayBar,CONF_TYPE_FLAG,0,0,1,NULL }, 
+ { "playbar",&gtkEnablePlayBar,CONF_TYPE_FLAG,0,0,1,NULL },
  { "load_fullscreen",&gtkLoadFullscreen,CONF_TYPE_FLAG,0,0,1,NULL },
  { "show_videowin", &gtkShowVideoWindow,CONF_TYPE_FLAG,0,0,1,NULL },
  { "stopxscreensaver",&stop_xscreensaver,CONF_TYPE_FLAG,0,0,1,NULL },
 
  { "autosync",&gtkAutoSyncOn,CONF_TYPE_FLAG,0,0,1,NULL },
  { "autosync_size",&gtkAutoSync,CONF_TYPE_INT,CONF_RANGE,0,10000,NULL },
- 
+
  { "gui_skin",&skinName,CONF_TYPE_STRING,0,0,0,NULL },
 
  { "gui_save_pos", &gui_save_pos, CONF_TYPE_FLAG,0,0,1,NULL},
@@ -204,7 +204,7 @@ static const m_option_t gui_opts[] =
  { "equ_channel_4",&gtkEquChannel4,CONF_TYPE_STRING,0,0,0,NULL },
  { "equ_channel_5",&gtkEquChannel5,CONF_TYPE_STRING,0,0,0,NULL },
  { "equ_channel_6",&gtkEquChannel6,CONF_TYPE_STRING,0,0,0,NULL },
- 
+
 #if 1
 #define audio_equ_row( i,j ) { "equ_band_"#i#j,&gtkEquChannels[i][j],CONF_TYPE_FLOAT,CONF_RANGE,-15.0,15.0,NULL },
    audio_equ_row( 0,0 ) audio_equ_row( 0,1 ) audio_equ_row( 0,2 ) audio_equ_row( 0,3 ) audio_equ_row( 0,4 ) audio_equ_row( 0,5 ) audio_equ_row( 0,6 ) audio_equ_row( 0,7 ) audio_equ_row( 0,8 ) audio_equ_row( 0,9 )
@@ -240,7 +240,7 @@ int cfg_read( void )
  mp_msg( MSGT_GPLAYER,MSGL_V,"[cfg] reading config file: %s\n",cfg );
  gui_conf=m_config_new();
  m_config_register_options( gui_conf,gui_opts );
- if ( !disable_gui_conf && m_config_parse_config_file( gui_conf,cfg ) < 0 ) 
+ if ( !disable_gui_conf && m_config_parse_config_file( gui_conf,cfg ) < 0 )
   {
    mp_msg( MSGT_GPLAYER,MSGL_FATAL,MSGTR_ConfigFileError );
 //   exit( 1 );
@@ -305,7 +305,7 @@ int cfg_write( void )
  FILE * f;
  int    i;
 
-// -- save configuration 
+// -- save configuration
  if ( (f=fopen( cfg,"wt+" )) )
   {
    for ( i=0;gui_opts[i].name;i++ )
@@ -323,7 +323,7 @@ int cfg_write( void )
    fclose( f );
   }
  free( cfg );
- 
+
 // -- save playlist
  cfg=get_path( "gui.pl" );
  if ( (f=fopen( cfg,"wt+" )) )
@@ -332,7 +332,7 @@ int cfg_write( void )
    while ( plCurrent )
     {
      if ( plCurrent->path && plCurrent->name )
-      { 
+      {
        fprintf( f,"%s\n",plCurrent->path );
        fprintf( f,"%s\n",plCurrent->name );
       }
@@ -369,4 +369,3 @@ int cfg_write( void )
 
  return 0;
 }
-
diff --git a/gui/interface.c b/gui/interface.c
index f41c5332bf..4a2103ec84 100644
--- a/gui/interface.c
+++ b/gui/interface.c
@@ -82,10 +82,10 @@ char * gstrcat( char ** dest,const char * src )
  if ( *dest )
   {
    tmp=malloc( strlen( *dest ) + strlen( src ) + 1 );
-   
+
    if ( tmp ) /* TODO: advanced error handling */
     {
-     strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest ); 
+     strcpy( tmp,*dest ); strcat( tmp,src ); free( *dest );
     }
    }
   else
@@ -175,7 +175,7 @@ void greplace(char ***list, const char *search, const char *replace)
  (*list)[i] = gstrdup(replace);
  (*list)[i + 1] = NULL;
 }
-							    
+
 void guiInit( void )
 {
  int i;
@@ -191,7 +191,7 @@ void guiInit( void )
  if ( stream_cache_size > 0 ) { gtkCacheOn=1; gtkCacheSize=stream_cache_size; }
  else if ( stream_cache_size == 0 ) gtkCacheOn = 0;
  if ( autosync && autosync != gtkAutoSync ) { gtkAutoSyncOn=1; gtkAutoSync=autosync; }
-   
+
 #ifdef CONFIG_ASS
  gtkASS.enabled = ass_enabled;
  gtkASS.use_margins = ass_use_margins;
@@ -200,7 +200,7 @@ void guiInit( void )
 #endif
 
  gtkInit();
-// --- initialize X 
+// --- initialize X
  wsXInit( (void *)mDisplay );
 // --- load skin
  skinDirInHome=get_path("skins");
@@ -245,7 +245,7 @@ void guiInit( void )
     appMPlayer.sub.y=0;
    }
   if (guiWinID>=0) appMPlayer.mainWindow.Parent=guiWinID;
- 
+
  wsCreateWindow( &appMPlayer.subWindow,
   appMPlayer.sub.x,appMPlayer.sub.y,appMPlayer.sub.width,appMPlayer.sub.height,
   wsNoBorder,wsShowMouseCursor|wsHandleMouseButton|wsHandleMouseMove,wsShowFrame|wsHideWindow,"MPlayer - Video" );
@@ -295,11 +295,11 @@ void guiInit( void )
 
  wsSetIcon( wsDisplay,appMPlayer.mainWindow.WindowID,guiIcon,guiIconMask );
  wsSetIcon( wsDisplay,appMPlayer.subWindow.WindowID,guiIcon,guiIconMask );
- 
+
  guiIntfStruct.Playing=0;
 
  if ( !appMPlayer.mainDecoration ) wsWindowDecoration( &appMPlayer.mainWindow,0 );
- 
+
  wsVisibleWindow( &appMPlayer.mainWindow,wsShowWindow );
 #if 0
  wsVisibleWindow( &appMPlayer.subWindow,wsShowWindow );
@@ -369,7 +369,7 @@ void guiDone( void )
    gui_main_pos_x=appMPlayer.mainWindow.X; gui_main_pos_y=appMPlayer.mainWindow.Y;
    gui_sub_pos_x=appMPlayer.subWindow.X; gui_sub_pos_y=appMPlayer.subWindow.Y;
   }
- 
+
 #ifdef CONFIG_ASS
  ass_enabled = gtkASS.enabled;
  ass_use_margins = gtkASS.use_margins;
@@ -426,7 +426,7 @@ void guiLoadFont( void )
   {
    vo_font=read_font_desc( font_name,font_factor,0 );
    if ( !vo_font ) mp_msg( MSGT_CPLAYER,MSGL_ERR,MSGTR_CantLoadFont,font_name );
-  } 
+  }
   else
    {
     font_name=gstrdup( get_path( "font/font.desc" ) );
@@ -479,9 +479,9 @@ void guiLoadSubtitle( char * name )
    mp_msg( MSGT_GPLAYER,MSGL_INFO,MSGTR_LoadingSubtitles,name );
    subdata=sub_read_file( name, guiIntfStruct.FPS );
    if ( !subdata ) mp_msg( MSGT_GPLAYER,MSGL_ERR,MSGTR_CantLoadSub,name );
-   sub_name = (malloc(2 * sizeof(char*))); //when mplayer will be restarted 
-   sub_name[0] = strdup(name);             //sub_name[0] will be read 
-   sub_name[1] = NULL;  
+   sub_name = (malloc(2 * sizeof(char*))); //when mplayer will be restarted
+   sub_name[0] = strdup(name);             //sub_name[0] will be read
+   sub_name[1] = NULL;
   }
  update_set_of_subtitles();
 
@@ -530,7 +530,7 @@ int guiGetEvent( int type,char * arg )
  stream_t * stream = (stream_t *) arg;
 #ifdef CONFIG_DVDREAD
  dvd_priv_t * dvdp = (dvd_priv_t *) arg;
-#endif 
+#endif
 
  if (guiIntfStruct.mpcontext) {
    audio_out = mpctx_get_audio_out(guiIntfStruct.mpcontext);
@@ -548,7 +548,7 @@ int guiGetEvent( int type,char * arg )
    case guiCEvent:
         switch ( (int)arg )
 	 {
-	  case guiSetPlay: 
+	  case guiSetPlay:
 	       guiIntfStruct.Playing=1;
 //	       if ( !gtkShowVideoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
 	       break;
@@ -612,15 +612,15 @@ int guiGetEvent( int type,char * arg )
 	switch( stream->type )
 	 {
 #ifdef CONFIG_DVDREAD
-	  case STREAMTYPE_DVD: 
+	  case STREAMTYPE_DVD:
 	       guiGetEvent( guiSetDVD,(char *)stream->priv );
 	       break;
 #endif
 #ifdef CONFIG_VCD
-	  case STREAMTYPE_VCD: 
+	  case STREAMTYPE_VCD:
 	       {
 	        int i;
-		
+
 		if (!stream->priv)
 		{
 		    guiIntfStruct.VCDTracks=0;
@@ -678,10 +678,10 @@ int guiGetEvent( int type,char * arg )
 	 }
 
 	if ( guiIntfStruct.NoWindow ) wsVisibleWindow( &appMPlayer.subWindow,wsHideWindow );
-	
+
 	if ( guiIntfStruct.StreamType == STREAMTYPE_STREAM ) btnSet( evSetMoviePosition,btnDisabled );
 	 else btnSet( evSetMoviePosition,btnReleased );
-	 
+
 // -- audio
         if ( audio_out )
 	{
@@ -732,14 +732,14 @@ int guiGetEvent( int type,char * arg )
 	  vcd_track=0;
 	  dvd_title=0;
 	  force_fps=0;
-	 }				
+	 }
 	guiIntfStruct.demuxer=NULL;
 	guiIntfStruct.sh_video=NULL;
 	wsPostRedisplay( &appMPlayer.subWindow );
 	break;
    case guiSetParameters:
         guiGetEvent( guiSetDefaults,NULL );
-        switch ( guiIntfStruct.StreamType ) 
+        switch ( guiIntfStruct.StreamType )
          {
 	  case STREAMTYPE_PLAYLIST:
 	       break;
@@ -765,32 +765,32 @@ int guiGetEvent( int type,char * arg )
 #endif
 	 }
 	//if ( guiIntfStruct.StreamType != STREAMTYPE_PLAYLIST ) // Does not make problems anymore!
-	 {	
+	 {
 	  if ( guiIntfStruct.Filename ) filename=gstrdup( guiIntfStruct.Filename );
 	   else if ( filename ) guiSetFilename( guiIntfStruct.Filename,filename );
 	 }
 // --- video opts
-       
+
        if ( !video_driver_list )
 	{
          int i = 0;
            while ( video_out_drivers[i++] )
-	    if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) 
+	    if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
 	     {
 	      gaddlist( &video_driver_list,(char *)video_out_drivers[i - 1]->info->short_name );
 	      break;
 	     }
 	 }
-	
+
 	if ( !video_driver_list && !video_driver_list[0] ) { gtkMessageBox( GTK_MB_FATAL,MSGTR_IDFGCVD ); exit_player( "gui init" ); }
 
 	{
 	 int i = 0;
          guiIntfStruct.NoWindow=False;
          while ( video_out_drivers[i++] )
-	  if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) 
+	  if ( video_out_drivers[i - 1]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
 	   {
-	    if  ( ( video_driver_list && !gstrcmp( video_driver_list[0],(char *)video_out_drivers[i - 1]->info->short_name ) )&&( video_out_drivers[i - 1]->control( VOCTRL_GUI_NOWINDOW,NULL ) == VO_TRUE ) ) 
+	    if  ( ( video_driver_list && !gstrcmp( video_driver_list[0],(char *)video_out_drivers[i - 1]->info->short_name ) )&&( video_out_drivers[i - 1]->control( VOCTRL_GUI_NOWINDOW,NULL ) == VO_TRUE ) )
 	      { guiIntfStruct.NoWindow=True; break; }
 	   }
 	}
@@ -809,10 +809,10 @@ int guiGetEvent( int type,char * arg )
 	   }
 	 }
 #endif
-// ---	 
+// ---
 	if ( gtkVfPP ) add_vf( "pp" );
 	 else remove_vf( "pp" );
-		 
+
 // --- audio opts
 //	if ( ao_plugin_cfg.plugin_list ) { free( ao_plugin_cfg.plugin_list ); ao_plugin_cfg.plugin_list=NULL; }
 	if (gtkAONorm)
@@ -891,14 +891,14 @@ int guiGetEvent( int type,char * arg )
 	gtkSubDumpMPSub=gtkSubDumpSrt=0;
         guiLoadFont();
 
-// --- misc		    
+// --- misc
 	if ( gtkCacheOn ) stream_cache_size=gtkCacheSize;
 	if ( gtkAutoSyncOn ) autosync=gtkAutoSync;
 
         if ( guiIntfStruct.AudioFile ) audio_stream=gstrdup( guiIntfStruct.AudioFile );
 	  else if ( guiIntfStruct.FilenameChanged ) gfree( (void**)&audio_stream );
 	  //audio_stream=NULL;
-	
+
         guiIntfStruct.DiskChanged=0;
         guiIntfStruct.FilenameChanged=0;
         guiIntfStruct.NewPlay=0;
@@ -921,7 +921,7 @@ void guiEventHandling( void )
  gtkEventHandling();
 }
 
-// --- 
+// ---
 
 float gtkEquChannels[6][10];
 
@@ -953,7 +953,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
 {
  equalizer_t * eq = (equalizer_t *)vparam;
  plItem      * item = (plItem *)vparam;
- 
+
  URLItem     * url_item = (URLItem *)vparam;
  int           is_added = True;
 
@@ -988,7 +988,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
 	if ( plCurrent && plCurrent->next)
 	 {
 	  plCurrent=plCurrent->next;
-	  /*if ( !plCurrent && plList ) 
+	  /*if ( !plCurrent && plList )
 	   {
 	    plItem * next = plList;
 	    while ( next->next ) { if ( !next->next ) break; next=next->next; }
@@ -1026,7 +1026,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
 	 // Free it
 	 if ( curr->path ) free( curr->path );
 	 if ( curr->name ) free( curr->name );
-	 free( curr ); 
+	 free( curr );
         }
 	mplCurr(); // Instead of using mplNext && mplPrev
 
@@ -1040,7 +1040,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
 	  {
 	   if ( curr->path ) free( curr->path );
 	   if ( curr->name ) free( curr->name );
-	   free( curr ); 
+	   free( curr );
 	  }
 	  else
 	   {
@@ -1049,7 +1049,7 @@ void * gtkSet( int cmd,float fparam, void * vparam )
 	      next=curr->next;
 	      if ( curr->path ) free( curr->path );
 	      if ( curr->name ) free( curr->name );
-	      free( curr ); 
+	      free( curr );
 	      curr=next;
 	     }
 	   }
@@ -1201,7 +1201,7 @@ int import_file_into_gui(char* temp, int insert)
 {
   char *filename, *pathname;
   plItem * item;
-	
+
   filename = strdup(mp_basename(temp));
   pathname = strdup(temp);
   if (strlen(pathname)-strlen(filename)>0)
@@ -1231,10 +1231,10 @@ int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* confi
 {
   play_tree_iter_t* my_pt_iter=NULL;
   int result=0;
-  
+
   if (!enqueue) // Delete playlist before "appending"
     gtkSet(gtkDelPl,0,0);
-  
+
   if((my_pt_iter=pt_iter_create(&my_playtree,config)))
   {
     while ((filename=pt_iter_get_next_file(my_pt_iter))!=NULL)
@@ -1250,7 +1250,7 @@ int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* confi
   if (!enqueue)
     filename=guiIntfStruct.Filename; // Backward compatibility; if file is specified on commandline,
   				     // gmplayer does directly start in Play-Mode.
-  else 
+  else
     filename=NULL;
 
   return result;
@@ -1262,7 +1262,7 @@ int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* confi
 // The file which contained the playlist is thereby replaced with it's contents.
 
 int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* config)
-{ 
+{
   play_tree_iter_t* my_pt_iter=NULL;
   int result=0;
   plItem * save=(plItem*)gtkSet( gtkGetCurrPlItem, 0, 0); // Save current item
@@ -1271,23 +1271,23 @@ int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* conf
   {
     while ((filename=pt_iter_get_next_file(my_pt_iter))!=NULL)
     {
-      if (import_file_into_gui(filename, 1)) // insert it into the list and set plCurrent=new item 
+      if (import_file_into_gui(filename, 1)) // insert it into the list and set plCurrent=new item
         result=1;
     }
     pt_iter_destroy(&my_pt_iter);
   }
 
-  if (save) 
+  if (save)
     gtkSet(gtkSetCurrPlItem, 0, (void*)save);
   else
     gtkSet(gtkSetCurrPlItem, 0, (void*)plList); // go to head, if plList was empty before
 
   if (save && result)
     gtkSet(gtkDelCurrPlItem, 0, 0);
-  
+
   mplCurr();  // Update filename
   filename=NULL;
-  
+
   return result;
 }
 
diff --git a/gui/interface.h b/gui/interface.h
index 65d9a0abd4..5ac532c481 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -70,7 +70,7 @@ typedef struct
    guiResizeStruct       resize;
    guiVideoStruct        videodata;
    guiUnknownErrorStruct error;
-   
+
    struct MPContext * mpcontext;
    void * sh_video;
    void * afilter;
@@ -116,10 +116,10 @@ typedef struct
 
    char * Subtitlename;
    int    SubtitleChanged;
-   
+
    char * Othername;
    int    OtherChanged;
-   
+
    char * AudioFile;
    int    AudioFileChanged;
 
diff --git a/gui/mplayer/gtk/about.c b/gui/mplayer/gtk/about.c
index d14d449e5f..ea3adf0717 100644
--- a/gui/mplayer/gtk/about.c
+++ b/gui/mplayer/gtk/about.c
@@ -69,7 +69,7 @@ GtkWidget * create_About( void )
 
   gtk_widget_realize( About );
   gtkAddIcon( About );
-  
+
   vbox=AddVBox( AddDialogFrame( About ),0 );
 
   pixmapstyle=gtk_widget_get_style( About );
@@ -94,8 +94,8 @@ GtkWidget * create_About( void )
   gtk_text_view_set_editable(GTK_TEXT_VIEW(AboutText), FALSE);
   gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(AboutText), FALSE);
   AboutTextBuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (AboutText));
-  gtk_text_buffer_get_iter_at_offset (AboutTextBuffer, &iter, 0);  
-#else  
+  gtk_text_buffer_get_iter_at_offset (AboutTextBuffer, &iter, 0);
+#else
   AboutText=gtk_text_new( NULL,NULL );
   gtk_text_set_editable(GTK_TEXT(AboutText), FALSE);
 #endif
@@ -103,15 +103,15 @@ GtkWidget * create_About( void )
   gtk_widget_show( AboutText );
   gtk_container_add( GTK_CONTAINER( scrolledwindow1 ),AboutText );
 #ifdef CONFIG_GTK2
-  gtk_text_buffer_insert (AboutTextBuffer, &iter,   
-#else  
+  gtk_text_buffer_insert (AboutTextBuffer, &iter,
+#else
   gtk_text_insert( GTK_TEXT( AboutText ),NULL,NULL,NULL,
 #endif
-  	"\n" 
-	MSGTR_ABOUT_UHU 
-	"             (http://www.uhulinux.hu/)\n" 
-	"\n" 
-	MSGTR_ABOUT_Contributors 
+  	"\n"
+	MSGTR_ABOUT_UHU
+	"             (http://www.uhulinux.hu/)\n"
+	"\n"
+	MSGTR_ABOUT_Contributors
 	"\n"
 	"     * Ackermann, Andreas\n"
 	"     * adland\n"
@@ -267,8 +267,8 @@ GtkWidget * create_About( void )
 	"     * Zealey, Mark\n"
 	"     * Ziv-Av, Matan\n"
 	"     * Zoltán, Márk Vicián\n"
-	"\n" 
-	MSGTR_ABOUT_Codecs_libs_contributions 
+	"\n"
+	MSGTR_ABOUT_Codecs_libs_contributions
 	"\n"
 	"     * Bellard, Fabrice\n"
 	"     * Chappelier, Vivien and Vincent, Damien\n"
@@ -280,7 +280,7 @@ GtkWidget * create_About( void )
 	"     * Lespinasse, Michel\n"
 	"     * Podlipec, Mark\n"
 	"\n"
-	MSGTR_ABOUT_Translations 
+	MSGTR_ABOUT_Translations
 	"\n"
 	"     * Biernat, Marcin\n"
 	"     * Fargas, Marc\n"
@@ -297,8 +297,8 @@ GtkWidget * create_About( void )
 	"     * Schiller, Wacław\n"
 	"     * Zubimendi, Andoni\n"
 	"\n"
-	MSGTR_ABOUT_Skins 
-	"\n" 
+	MSGTR_ABOUT_Skins
+	"\n"
 	"     * Azrael\n"
 	"     * Bekesi, Viktor\n"
 	"     * Burt.S.\n"
diff --git a/gui/mplayer/gtk/eq.c b/gui/mplayer/gtk/eq.c
index 6a5e475344..d4ab6c1aea 100644
--- a/gui/mplayer/gtk/eq.c
+++ b/gui/mplayer/gtk/eq.c
@@ -91,7 +91,7 @@ static void eqSetBands( int channel )
    get_video_colors( guiIntfStruct.sh_video,"hue",&vo_gamma_hue );
    get_video_colors( guiIntfStruct.sh_video,"saturation",&vo_gamma_saturation );
   }
-										    
+
  gtk_adjustment_set_value( VContrastadj,(float)vo_gamma_contrast );
  gtk_adjustment_set_value( VBrightnessadj,(float)vo_gamma_brightness );
  gtk_adjustment_set_value( VHueadj,(float)vo_gamma_hue );
@@ -177,7 +177,7 @@ void HideEqualizer( void )
 static gboolean eqHScaleMotion( GtkWidget * widget,GdkEventMotion  * event,gpointer user_data )
 {
  equalizer_t eq;
- switch ( (int)user_data ) 
+ switch ( (int)user_data )
   {
    case 0: eq.gain=A3125adj->value; break;
    case 1: eq.gain=A6250adj->value; break;
@@ -193,13 +193,13 @@ static gboolean eqHScaleMotion( GtkWidget * widget,GdkEventMotion  * event,gpoin
   }
  eq.gain=0.0f - eq.gain;
  eq.band=(int)user_data;
- if ( Channel == -1 ) 
+ if ( Channel == -1 )
   {
    int i;
    for ( i=0;i<6;i++ )
     { eq.channel=i; gtkSet( gtkSetEqualizer,0,&eq ); }
   } else { eq.channel=Channel; gtkSet( gtkSetEqualizer,0,&eq ); }
-  
+
  return FALSE;
 }
 
@@ -218,16 +218,16 @@ static gboolean eqVScaleMotion( GtkWidget * widget,GdkEventMotion  * event,gpoin
 }
 
 static void eqButtonReleased( GtkButton * button,gpointer user_data )
-{ 
+{
  switch( (int)user_data )
   {
    case 0: HideEqualizer(); break;
-   case 1: 
+   case 1:
 	if ( gtk_notebook_get_current_page( GTK_NOTEBOOK( Notebook ) ) == 0 )
-	 { 
+	 {
 	  if ( !guiIntfStruct.Playing || !gtkEnableAudioEqualizer ) break;
-	  gtkSet( gtkSetEqualizer,0,NULL ); 
-	  eqSetBands( Channel ); 
+	  gtkSet( gtkSetEqualizer,0,NULL );
+	  eqSetBands( Channel );
 	 }
 	 else
 	  {
@@ -324,7 +324,7 @@ GtkWidget * create_Equalizer( void )
   A3125adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
   A3125=AddVScaler( A3125adj,NULL,-1 );
     gtk_table_attach( GTK_TABLE( table1 ),A3125,0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
-  
+
   A6250adj=GTK_ADJUSTMENT( gtk_adjustment_new( 0,-eqRange,eqRange,0.5,0,0 ) );
   A6250=AddVScaler( A6250adj,NULL,-1 );
     gtk_table_attach( GTK_TABLE( table1 ),A6250,1,2,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),0,0 );
@@ -408,7 +408,7 @@ GtkWidget * create_Equalizer( void )
   gtk_widget_set_name( table1,"table1" );
   gtk_widget_show( table1 );
   gtk_container_add( GTK_CONTAINER( Notebook ),table1 );
-  
+
   gtk_table_attach( GTK_TABLE( table1 ),
     AddLabel( MSGTR_EQU_Contrast,NULL ),
     0,1,0,1,(GtkAttachOptions)( GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
@@ -457,7 +457,7 @@ GtkWidget * create_Equalizer( void )
   Config=AddButton( MSGTR_Config,hbuttonbox1 );
   Clear=AddButton( MSGTR_Clear,hbuttonbox1 );
   Ok=AddButton( MSGTR_Ok,hbuttonbox1 );
-  
+
   gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
   gtk_widget_add_accelerator( Ok,"clicked",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
 
@@ -481,7 +481,7 @@ GtkWidget * create_Equalizer( void )
   gtk_signal_connect( GTK_OBJECT( VBrightness ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)2 );
   gtk_signal_connect( GTK_OBJECT( VHue ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void*)3 );
   gtk_signal_connect( GTK_OBJECT( VSaturation ),"motion_notify_event",GTK_SIGNAL_FUNC( eqVScaleMotion ),(void *)4 );
-  
+
   gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)0 );
   gtk_signal_connect( GTK_OBJECT( Clear ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)1 );
   gtk_signal_connect( GTK_OBJECT( Config ),"clicked",GTK_SIGNAL_FUNC( eqButtonReleased ),(void *)2 );
@@ -518,14 +518,14 @@ void ShowEquConfig( void )
 
  if ( EquConfig ) gtkActive( EquConfig );
     else EquConfig=create_EquConfig();
-	
+
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Right  );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Front_Left );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Back_Right );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Back_Left );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Center );
  Items=g_list_append( Items,(gpointer)MSGTR_EQU_Bass );
- 
+
  gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel1 ),Items );
  gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel2 ),Items );
  gtk_combo_set_popdown_strings( GTK_COMBO( CBChannel3 ),Items );
@@ -550,7 +550,7 @@ void HideEquConfig( void )
 {
  if ( !EquConfig ) return;
  gtk_widget_hide( EquConfig );
- gtk_widget_destroy( EquConfig ); 
+ gtk_widget_destroy( EquConfig );
  EquConfig=NULL;
 }
 
@@ -634,35 +634,35 @@ GtkWidget * create_EquConfig( void )
 
   CBChannel2=AddComboBox( NULL );
     gtk_table_attach( GTK_TABLE( table1 ),CBChannel2,1,2,1,2,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CEChannel2=GTK_COMBO( CBChannel2 )->entry;
   gtk_widget_set_name( CEChannel2,"CEChannel2" );
   gtk_widget_show( CEChannel2 );
 
   CBChannel3=AddComboBox( NULL );
     gtk_table_attach( GTK_TABLE( table1 ),CBChannel3,1,2,2,3,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CEChannel3=GTK_COMBO( CBChannel3 )->entry;
   gtk_widget_set_name( CEChannel3,"CEChannel3" );
   gtk_widget_show( CEChannel3 );
 
   CBChannel4=AddComboBox( NULL );
     gtk_table_attach( GTK_TABLE( table1 ),CBChannel4,1,2,3,4,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CEChannel4=GTK_COMBO( CBChannel4 )->entry;
   gtk_widget_set_name( CEChannel4,"CEChannel4" );
   gtk_widget_show( CEChannel4 );
 
   CBChannel5=AddComboBox( NULL );
     gtk_table_attach( GTK_TABLE( table1 ),CBChannel5,1,2,4,5,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CEChannel5=GTK_COMBO( CBChannel5 )->entry;
   gtk_widget_set_name( CEChannel5,"CEChannel5" );
   gtk_widget_show( CEChannel5 );
 
   CBChannel6=AddComboBox( NULL );
     gtk_table_attach( GTK_TABLE( table1 ),CBChannel6,1,2,5,6,(GtkAttachOptions)( GTK_EXPAND | GTK_FILL ),(GtkAttachOptions)( 0 ),0,0 );
-  
+
   CEChannel6=GTK_COMBO( CBChannel6 )->entry;
   gtk_widget_set_name( CEChannel6,"CEChannel6" );
   gtk_widget_show( CEChannel6 );
@@ -680,7 +680,7 @@ GtkWidget * create_EquConfig( void )
   gtk_widget_add_accelerator( ecCancel,"clicked",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
 
   gtk_signal_connect( GTK_OBJECT( EquConfig ),"destroy",GTK_SIGNAL_FUNC( WidgetDestroy ),&EquConfig );
-  
+
   gtk_signal_connect( GTK_OBJECT( ecOk ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)1 );
   gtk_signal_connect( GTK_OBJECT( ecCancel ),"clicked",GTK_SIGNAL_FUNC( ecButtonReleased ),(void *)0 );
 
@@ -688,4 +688,3 @@ GtkWidget * create_EquConfig( void )
 
   return EquConfig;
 }
-
diff --git a/gui/mplayer/gtk/gtk_common.c b/gui/mplayer/gtk/gtk_common.c
index 2c7ee9aee3..495a5ea637 100644
--- a/gui/mplayer/gtk/gtk_common.c
+++ b/gui/mplayer/gtk/gtk_common.c
@@ -71,7 +71,7 @@ GtkWidget * AddVBox( GtkWidget * parent,int type )
  vbox=gtk_vbox_new( FALSE,0 );
  gtk_widget_set_name( vbox,"vbox" );
  gtk_widget_show( vbox );
- if ( parent ) 
+ if ( parent )
   {
    if ( type ) gtk_box_pack_start( GTK_BOX( parent ),vbox,FALSE,FALSE,0 );
     else gtk_container_add( GTK_CONTAINER( parent ),vbox );
diff --git a/gui/mplayer/gtk/gtk_url.c b/gui/mplayer/gtk/gtk_url.c
index e6385f15ee..