Mercurial > mplayer.hg

changeset 36840:511047e8e0a2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unnecessary casts.
author ib
date Tue, 25 Feb 2014 15:16:01 +0000
parents 8474d0444828
children c659d33157e3
files gui/dialog/preferences.c gui/win32/preferences.c gui/win32/skinload.c
diffstat 3 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/gui/dialog/preferences.c	Tue Feb 25 13:19:53 2014 +0000
+++ b/gui/dialog/preferences.c	Tue Feb 25 15:16:01 2014 +0000
@@ -354,16 +354,16 @@
 	 int i;
 	 const char * tmp = gtk_entry_get_text( GTK_ENTRY( EVFM ) );
          for( i=0;mpcodecs_vd_drivers[i];i++ )
-          if ( !gstrcmp( tmp,(char *)mpcodecs_vd_drivers[i]->info->name ) )
-	   { listSet( &video_fm_list,(char *)mpcodecs_vd_drivers[i]->info->short_name ); break; }
+          if ( !gstrcmp( tmp,mpcodecs_vd_drivers[i]->info->name ) )
+	   { listSet( &video_fm_list,mpcodecs_vd_drivers[i]->info->short_name ); break; }
 	}
 
 	{
 	 int i;
 	 const char * tmp = gtk_entry_get_text( GTK_ENTRY( EAFM ) );
          for( i=0;mpcodecs_ad_drivers[i];i++ )
-          if ( !gstrcmp( tmp,(char *)mpcodecs_ad_drivers[i]->info->name ) )
-	   { listSet( &audio_fm_list,(char *)mpcodecs_ad_drivers[i]->info->short_name ); break; }
+          if ( !gstrcmp( tmp,mpcodecs_ad_drivers[i]->info->name ) )
+	   { listSet( &audio_fm_list,mpcodecs_ad_drivers[i]->info->short_name ); break; }
 	}
 
 	/* 6th page */
@@ -1203,7 +1203,7 @@
       char * name = gstrdup( audio_driver_list[0] );
       char * sep = gstrchr( audio_driver_list[0],':' );
       if ( sep ) *sep=0;
-      if ( !gstrcmp( name,(char *)info->short_name ) ) old_audio_driver=i - 1;
+      if ( !gstrcmp( name,info->short_name ) ) old_audio_driver=i - 1;
       free( name );
      }
     tmp[0]=(char *)info->short_name; tmp[1]=(char *)info->name; gtk_clist_append( GTK_CLIST( CLADrivers ),tmp );
@@ -1245,7 +1245,7 @@
   while ( video_out_drivers[i] )
    if ( video_out_drivers[i++]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE )
     {
-     if ( video_driver_list && !gstrcmp( video_driver_list[0],(char *)video_out_drivers[i - 1]->info->short_name ) ) old_video_driver=c; c++;
+     if ( video_driver_list && !gstrcmp( video_driver_list[0],video_out_drivers[i - 1]->info->short_name ) ) old_video_driver=c; c++;
      tmp[0]=(char *)video_out_drivers[i - 1]->info->short_name; tmp[1]=(char *)video_out_drivers[i - 1]->info->name;
      gtk_clist_append( GTK_CLIST( CLVDrivers ),tmp );
     }
@@ -1347,7 +1347,7 @@
   for( i=0;mpcodecs_vd_drivers[i];i++ )
    {
     Items=g_list_append( Items,(char *)mpcodecs_vd_drivers[i]->info->name );
-    if ( video_fm_list && !gstrcmp( video_fm_list[0],(char *)mpcodecs_vd_drivers[i]->info->short_name ) ) name=(char *)mpcodecs_vd_drivers[i]->info->name;
+    if ( video_fm_list && !gstrcmp( video_fm_list[0],mpcodecs_vd_drivers[i]->info->short_name ) ) name=(char *)mpcodecs_vd_drivers[i]->info->name;
    }
   gtk_combo_set_popdown_strings( GTK_COMBO( CBVFM ),Items );
   g_list_free( Items );
@@ -1363,7 +1363,7 @@
   for( i=0;mpcodecs_ad_drivers[i];i++ )
    {
     Items=g_list_append( Items,(char *)mpcodecs_ad_drivers[i]->info->name );
-    if ( audio_fm_list && !gstrcmp( audio_fm_list[0],(char *)mpcodecs_ad_drivers[i]->info->short_name ) ) name=(char *)mpcodecs_ad_drivers[i]->info->name;
+    if ( audio_fm_list && !gstrcmp( audio_fm_list[0],mpcodecs_ad_drivers[i]->info->short_name ) ) name=(char *)mpcodecs_ad_drivers[i]->info->name;
    }
   gtk_combo_set_popdown_strings( GTK_COMBO( CBAFM ),Items );
   g_list_free( Items );
--- a/gui/win32/preferences.c	Tue Feb 25 13:19:53 2014 +0000
+++ b/gui/win32/preferences.c	Tue Feb 25 15:16:01 2014 +0000
@@ -363,7 +363,7 @@
             {
                 const vo_info_t *info = video_out_drivers[i++]->info;
                 if(!video_driver_list)
-                    listSet(&video_driver_list, (char *)info->short_name);
+                    listSet(&video_driver_list, info->short_name);
                 SendDlgItemMessage(hwnd, ID_VO_DRIVER, CB_ADDSTRING, 0, (LPARAM) info->short_name);
             }
             /* Special case for directx:noaccel */
@@ -374,7 +374,7 @@
             {
                 const ao_info_t *info = audio_out_drivers[j++]->info;
                 if(!audio_driver_list)
-                    listSet(&audio_driver_list, (char *)info->short_name);
+                    listSet(&audio_driver_list, info->short_name);
                 SendDlgItemMessage(hwnd, ID_AO_DRIVER, CB_ADDSTRING, 0, (LPARAM) info->short_name);
             }
             SendMessage(ao_driver, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
--- a/gui/win32/skinload.c	Tue Feb 25 13:19:53 2014 +0000
+++ b/gui/win32/skinload.c	Tue Feb 25 15:16:01 2014 +0000
@@ -421,7 +421,7 @@
     }
     else if(!strncmp(desc, "selected", 8))
     {
-        win->base->bitmap[1] = pngRead(skin, (char *) desc + 9);
+        win->base->bitmap[1] = pngRead(skin, desc + 9);
         mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[SKIN] [ITEM] [BASE] added image %s\n", win->base->bitmap[1]->name);
     }
     else if(!strncmp(desc, "slabel",6))