Mercurial > mplayer.hg

comparison gui/mplayer/gtk/fs.c @ 33555:c5a19bbeac2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetic: Rename some GUI variables and functions. The new names are more intelligible and consistent. List of changes: guiIntfStruct -> guiInfo appMPlayer -> guiApp txSample -> guiImage (and member BPP -> Bpp) mplDrawBuffer -> mainDrawBuffer mplPBDrawBuffer -> playbarDrawBuffer mplMenuDrawBuffer -> menuDrawBuffer mpl.* -> ui.* (or mpl dropped) .*bar.* -> .*playbar.* URLItem -> urlItem ChangeSkin -> uiChangeSkin Convert32to1 -> bpRenderMask
author ib
date Sat, 18 Jun 2011 14:33:41 +0000
parents 6ddb6b73281a
children
comparison
equal deleted inserted replaced
33554:02d94048970e 33555:c5a19bbeac2b
261 fsList_items=g_list_append( fsList_items,fsVideoFilterNames[i][0] ); 261 fsList_items=g_list_append( fsList_items,fsVideoFilterNames[i][0] );
262 k = fsLastVideoFilterSelected; 262 k = fsLastVideoFilterSelected;
263 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); 263 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items );
264 g_list_free( fsList_items ); 264 g_list_free( fsList_items );
265 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsVideoFilterNames[k >= 0 ? k : i-2][0] ); 265 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsVideoFilterNames[k >= 0 ? k : i-2][0] );
266 tmp=guiIntfStruct.Filename; 266 tmp=guiInfo.Filename;
267 break; 267 break;
268 case fsSubtitleSelector: 268 case fsSubtitleSelector:
269 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_SubtitleSelect ); 269 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_SubtitleSelect );
270 fsList_items=NULL; 270 fsList_items=NULL;
271 for( i=0;fsSubtitleFilterNames[i][0];i++ ) 271 for( i=0;fsSubtitleFilterNames[i][0];i++ )
272 fsList_items=g_list_append( fsList_items,fsSubtitleFilterNames[i][0] ); 272 fsList_items=g_list_append( fsList_items,fsSubtitleFilterNames[i][0] );
273 k = fsLastSubtitleFilterSelected; 273 k = fsLastSubtitleFilterSelected;
274 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); 274 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items );
275 g_list_free( fsList_items ); 275 g_list_free( fsList_items );
276 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsSubtitleFilterNames[k >= 0 ? k : i-2][0] ); 276 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsSubtitleFilterNames[k >= 0 ? k : i-2][0] );
277 tmp=guiIntfStruct.Subtitlename; 277 tmp=guiInfo.Subtitlename;
278 break; 278 break;
279 case fsOtherSelector: 279 case fsOtherSelector:
280 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_OtherSelect ); 280 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_OtherSelect );
281 fsList_items=NULL; 281 fsList_items=NULL;
282 for( i=0;fsOtherFilterNames[i][0];i++ ) 282 for( i=0;fsOtherFilterNames[i][0];i++ )
283 fsList_items=g_list_append( fsList_items,fsOtherFilterNames[i][0] ); 283 fsList_items=g_list_append( fsList_items,fsOtherFilterNames[i][0] );
284 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); 284 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items );
285 g_list_free( fsList_items ); 285 g_list_free( fsList_items );
286 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsOtherFilterNames[0][0] ); 286 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsOtherFilterNames[0][0] );
287 tmp=guiIntfStruct.Othername; 287 tmp=guiInfo.Othername;
288 break; 288 break;
289 case fsAudioSelector: 289 case fsAudioSelector:
290 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_AudioFileSelect ); 290 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_AudioFileSelect );
291 fsList_items=NULL; 291 fsList_items=NULL;
292 for( i=0;fsAudioFileNames[i][0];i++ ) 292 for( i=0;fsAudioFileNames[i][0];i++ )
293 fsList_items=g_list_append( fsList_items,fsAudioFileNames[i][0] ); 293 fsList_items=g_list_append( fsList_items,fsAudioFileNames[i][0] );
294 k = fsLastAudioFilterSelected; 294 k = fsLastAudioFilterSelected;
295 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); 295 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items );
296 g_list_free( fsList_items ); 296 g_list_free( fsList_items );
297 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsAudioFileNames[k >= 0 ? k : i-2][0] ); 297 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsAudioFileNames[k >= 0 ? k : i-2][0] );
298 tmp=guiIntfStruct.AudioFile; 298 tmp=guiInfo.AudioFile;
299 break; 299 break;
300 case fsFontSelector: 300 case fsFontSelector:
301 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_FontSelect ); 301 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_FontSelect );
302 fsList_items=NULL; 302 fsList_items=NULL;
303 for( i=0;fsFontFileNames[i][0];i++ ) 303 for( i=0;fsFontFileNames[i][0];i++ )
474 474
475 fsSelectedDirectory=(unsigned char *)get_current_dir_name(); 475 fsSelectedDirectory=(unsigned char *)get_current_dir_name();
476 switch ( fsType ) 476 switch ( fsType )
477 { 477 {
478 case fsVideoSelector: 478 case fsVideoSelector:
479 guiSetDF( guiIntfStruct.Filename,fsSelectedDirectory,fsSelectedFile ); 479 guiSetDF( guiInfo.Filename,fsSelectedDirectory,fsSelectedFile );
480 guiIntfStruct.StreamType=STREAMTYPE_FILE; 480 guiInfo.StreamType=STREAMTYPE_FILE;
481 guiIntfStruct.FilenameChanged=1; sub_fps=0; 481 guiInfo.FilenameChanged=1; sub_fps=0;
482 gfree( (void **)&guiIntfStruct.AudioFile ); 482 gfree( (void **)&guiInfo.AudioFile );
483 gfree( (void **)&guiIntfStruct.Subtitlename ); 483 gfree( (void **)&guiInfo.Subtitlename );
484 fs_PersistantHistory( get_current_dir_name_utf8() ); //totem, write into history 484 fs_PersistantHistory( get_current_dir_name_utf8() ); //totem, write into history
485 break; 485 break;
486 case fsSubtitleSelector: 486 case fsSubtitleSelector:
487 guiSetDF( guiIntfStruct.Subtitlename,fsSelectedDirectory,fsSelectedFile ); 487 guiSetDF( guiInfo.Subtitlename,fsSelectedDirectory,fsSelectedFile );
488 guiLoadSubtitle( guiIntfStruct.Subtitlename ); 488 guiLoadSubtitle( guiInfo.Subtitlename );
489 break; 489 break;
490 case fsOtherSelector: 490 case fsOtherSelector:
491 guiSetDF( guiIntfStruct.Othername,fsSelectedDirectory,fsSelectedFile ); 491 guiSetDF( guiInfo.Othername,fsSelectedDirectory,fsSelectedFile );
492 break; 492 break;
493 case fsAudioSelector: 493 case fsAudioSelector:
494 guiSetDF( guiIntfStruct.AudioFile,fsSelectedDirectory,fsSelectedFile ); 494 guiSetDF( guiInfo.AudioFile,fsSelectedDirectory,fsSelectedFile );
495 break; 495 break;
496 case fsFontSelector: 496 case fsFontSelector:
497 guiSetDF( font_name,fsSelectedDirectory,fsSelectedFile ); 497 guiSetDF( font_name,fsSelectedDirectory,fsSelectedFile );
498 guiLoadFont(); 498 guiLoadFont();
499 if ( Preferences ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name ); 499 if ( Preferences ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name );
507 { 507 {
508 if ( !strcmp( item->data,fsSelectedDirectory ) ) i=0; 508 if ( !strcmp( item->data,fsSelectedDirectory ) ) i=0;
509 item=item->next; 509 item=item->next;
510 } 510 }
511 if ( i ) fsTopList_items=g_list_prepend( fsTopList_items,(gchar *)get_current_dir_name_utf8() ); 511 if ( i ) fsTopList_items=g_list_prepend( fsTopList_items,(gchar *)get_current_dir_name_utf8() );
512 if ( mplMainAutoPlay ) { mplMainAutoPlay=0; mplEventHandling( evPlay,0 ); } 512 if ( uiMainAutoPlay ) { uiMainAutoPlay=0; uiEventHandling( evPlay,0 ); }
513 else guiGetEvent( guiCEvent,guiSetStop ); 513 else guiGetEvent( guiCEvent,guiSetStop );
514 } 514 }
515 515
516 static void fs_Cancel_released( GtkButton * button,gpointer user_data ) 516 static void fs_Cancel_released( GtkButton * button,gpointer user_data )
517 { 517 {