Mercurial > mplayer.hg
comparison gui/dialog/preferences.c @ 36840:511047e8e0a2
Remove unnecessary casts.
author | ib |
---|---|
date | Tue, 25 Feb 2014 15:16:01 +0000 |
parents | 17d0c4e89555 |
children | d8b2651bfeab |
comparison
equal
deleted
inserted
replaced
36839:8474d0444828 | 36840:511047e8e0a2 |
---|---|
352 | 352 |
353 { | 353 { |
354 int i; | 354 int i; |
355 const char * tmp = gtk_entry_get_text( GTK_ENTRY( EVFM ) ); | 355 const char * tmp = gtk_entry_get_text( GTK_ENTRY( EVFM ) ); |
356 for( i=0;mpcodecs_vd_drivers[i];i++ ) | 356 for( i=0;mpcodecs_vd_drivers[i];i++ ) |
357 if ( !gstrcmp( tmp,(char *)mpcodecs_vd_drivers[i]->info->name ) ) | 357 if ( !gstrcmp( tmp,mpcodecs_vd_drivers[i]->info->name ) ) |
358 { listSet( &video_fm_list,(char *)mpcodecs_vd_drivers[i]->info->short_name ); break; } | 358 { listSet( &video_fm_list,mpcodecs_vd_drivers[i]->info->short_name ); break; } |
359 } | 359 } |
360 | 360 |
361 { | 361 { |
362 int i; | 362 int i; |
363 const char * tmp = gtk_entry_get_text( GTK_ENTRY( EAFM ) ); | 363 const char * tmp = gtk_entry_get_text( GTK_ENTRY( EAFM ) ); |
364 for( i=0;mpcodecs_ad_drivers[i];i++ ) | 364 for( i=0;mpcodecs_ad_drivers[i];i++ ) |
365 if ( !gstrcmp( tmp,(char *)mpcodecs_ad_drivers[i]->info->name ) ) | 365 if ( !gstrcmp( tmp,mpcodecs_ad_drivers[i]->info->name ) ) |
366 { listSet( &audio_fm_list,(char *)mpcodecs_ad_drivers[i]->info->short_name ); break; } | 366 { listSet( &audio_fm_list,mpcodecs_ad_drivers[i]->info->short_name ); break; } |
367 } | 367 } |
368 | 368 |
369 /* 6th page */ | 369 /* 6th page */ |
370 gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) ); | 370 gtkVfPP=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBPostprocess ) ); |
371 gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) ); | 371 gtkLoadFullscreen=gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( CBLoadFullscreen ) ); |
1201 if ( audio_driver_list ) | 1201 if ( audio_driver_list ) |
1202 { | 1202 { |
1203 char * name = gstrdup( audio_driver_list[0] ); | 1203 char * name = gstrdup( audio_driver_list[0] ); |
1204 char * sep = gstrchr( audio_driver_list[0],':' ); | 1204 char * sep = gstrchr( audio_driver_list[0],':' ); |
1205 if ( sep ) *sep=0; | 1205 if ( sep ) *sep=0; |
1206 if ( !gstrcmp( name,(char *)info->short_name ) ) old_audio_driver=i - 1; | 1206 if ( !gstrcmp( name,info->short_name ) ) old_audio_driver=i - 1; |
1207 free( name ); | 1207 free( name ); |
1208 } | 1208 } |
1209 tmp[0]=(char *)info->short_name; tmp[1]=(char *)info->name; gtk_clist_append( GTK_CLIST( CLADrivers ),tmp ); | 1209 tmp[0]=(char *)info->short_name; tmp[1]=(char *)info->name; gtk_clist_append( GTK_CLIST( CLADrivers ),tmp ); |
1210 } | 1210 } |
1211 if ( old_audio_driver > -1 ) | 1211 if ( old_audio_driver > -1 ) |
1243 old_video_driver=0; | 1243 old_video_driver=0; |
1244 if ( CLVDrivers ) gtk_clist_clear( GTK_CLIST( CLVDrivers ) ); | 1244 if ( CLVDrivers ) gtk_clist_clear( GTK_CLIST( CLVDrivers ) ); |
1245 while ( video_out_drivers[i] ) | 1245 while ( video_out_drivers[i] ) |
1246 if ( video_out_drivers[i++]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) | 1246 if ( video_out_drivers[i++]->control( VOCTRL_GUISUPPORT,NULL ) == VO_TRUE ) |
1247 { | 1247 { |
1248 if ( video_driver_list && !gstrcmp( video_driver_list[0],(char *)video_out_drivers[i - 1]->info->short_name ) ) old_video_driver=c; c++; | 1248 if ( video_driver_list && !gstrcmp( video_driver_list[0],video_out_drivers[i - 1]->info->short_name ) ) old_video_driver=c; c++; |
1249 tmp[0]=(char *)video_out_drivers[i - 1]->info->short_name; tmp[1]=(char *)video_out_drivers[i - 1]->info->name; | 1249 tmp[0]=(char *)video_out_drivers[i - 1]->info->short_name; tmp[1]=(char *)video_out_drivers[i - 1]->info->name; |
1250 gtk_clist_append( GTK_CLIST( CLVDrivers ),tmp ); | 1250 gtk_clist_append( GTK_CLIST( CLVDrivers ),tmp ); |
1251 } | 1251 } |
1252 gtk_clist_select_row( GTK_CLIST( CLVDrivers ),old_video_driver,0 ); | 1252 gtk_clist_select_row( GTK_CLIST( CLVDrivers ),old_video_driver,0 ); |
1253 gtk_clist_get_text( GTK_CLIST( CLVDrivers ),old_video_driver,0,(char **)&vo_driver ); | 1253 gtk_clist_get_text( GTK_CLIST( CLVDrivers ),old_video_driver,0,(char **)&vo_driver ); |
1345 | 1345 |
1346 Items=g_list_append( Items,MSGTR_GUI__Default_ ); | 1346 Items=g_list_append( Items,MSGTR_GUI__Default_ ); |
1347 for( i=0;mpcodecs_vd_drivers[i];i++ ) | 1347 for( i=0;mpcodecs_vd_drivers[i];i++ ) |
1348 { | 1348 { |
1349 Items=g_list_append( Items,(char *)mpcodecs_vd_drivers[i]->info->name ); | 1349 Items=g_list_append( Items,(char *)mpcodecs_vd_drivers[i]->info->name ); |
1350 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; | 1350 if ( video_fm_list && !gstrcmp( video_fm_list[0],mpcodecs_vd_drivers[i]->info->short_name ) ) name=(char *)mpcodecs_vd_drivers[i]->info->name; |
1351 } | 1351 } |
1352 gtk_combo_set_popdown_strings( GTK_COMBO( CBVFM ),Items ); | 1352 gtk_combo_set_popdown_strings( GTK_COMBO( CBVFM ),Items ); |
1353 g_list_free( Items ); | 1353 g_list_free( Items ); |
1354 if ( name ) gtk_entry_set_text( GTK_ENTRY( EVFM ),name ); | 1354 if ( name ) gtk_entry_set_text( GTK_ENTRY( EVFM ),name ); |
1355 } | 1355 } |
1361 | 1361 |
1362 Items=g_list_append( Items,MSGTR_GUI__Default_ ); | 1362 Items=g_list_append( Items,MSGTR_GUI__Default_ ); |
1363 for( i=0;mpcodecs_ad_drivers[i];i++ ) | 1363 for( i=0;mpcodecs_ad_drivers[i];i++ ) |
1364 { | 1364 { |
1365 Items=g_list_append( Items,(char *)mpcodecs_ad_drivers[i]->info->name ); | 1365 Items=g_list_append( Items,(char *)mpcodecs_ad_drivers[i]->info->name ); |
1366 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; | 1366 if ( audio_fm_list && !gstrcmp( audio_fm_list[0],mpcodecs_ad_drivers[i]->info->short_name ) ) name=(char *)mpcodecs_ad_drivers[i]->info->name; |
1367 } | 1367 } |
1368 gtk_combo_set_popdown_strings( GTK_COMBO( CBAFM ),Items ); | 1368 gtk_combo_set_popdown_strings( GTK_COMBO( CBAFM ),Items ); |
1369 g_list_free( Items ); | 1369 g_list_free( Items ); |
1370 if ( name ) gtk_entry_set_text( GTK_ENTRY( EAFM ),name ); | 1370 if ( name ) gtk_entry_set_text( GTK_ENTRY( EAFM ),name ); |
1371 } | 1371 } |