From 9488c3c7ed2cf1b312f1450840dae0dca411da43 Mon Sep 17 00:00:00 2001 From: pontscho Date: Sat, 31 Aug 2002 15:55:03 +0000 Subject: - add None to audio/video family selection - add *.divx and case insensitive search to fs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7204 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/mplayer/gtk/fs.c | 106 +++++++++++++++++++++++++++++-------------------- Gui/mplayer/gtk/opts.c | 2 + 2 files changed, 64 insertions(+), 44 deletions(-) (limited to 'Gui') diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c index 1bf9ed5c79..28df7115cd 100644 --- a/Gui/mplayer/gtk/fs.c +++ b/Gui/mplayer/gtk/fs.c @@ -40,21 +40,25 @@ int fsType = 0; int gtkVFileSelect = 0; -#define fsNumberOfVideoFilterNames 9 -char * fsVideoFilterNames[fsNumberOfVideoFilterNames+1][2] = +char * fsVideoFilterNames[][2] = { { "MPEG files (*.mpg,*.mpeg)", "*.mpg,*.mpeg" }, { "VOB files (*.vob)", "*.vob" }, { "AVI files (*.avi)", "*.avi" }, + { "DiVX files (*.divx)", "*.divx" }, { "QT files (*.mov)", "*.mov" }, { "ASF files (*.asf)", "*.asf" }, { "VIVO files (*.viv)", "*.viv" }, { "Windows Media Video (*.wmv)", "*.wmv" }, + { "MP3 files (*.mp3,mp2)", "*.mp3,*.mp2" }, + { "Wave files (*.wav)", "*.wav" }, + { "WMA files (*.wma)", "*.wma" }, { "Audio files (*.wav,*.mp2,*.mp3,*.wma)", "*.wav,*.mp2,*.mp3,*.wma" }, - { "Video files (*.mpg,*.mpeg,*.vob,*.avi,*.mov,*.asf,*.viv,*.wmv)", "*.mpg,*.mpeg,*.vob,*.avi,*.mov,*.asf,*.viv,*.wmv" }, - { "All files (*)", "*" } }; + { "All video files", "*.mpg,*.mpeg,*.vob,*.avi,*.divx,*.mov,*.asf,*.viv,*.wmv" }, + { "All files (*)", "*" }, + { NULL,NULL } + }; -#define fsNumberOfSubtitleFilterNames 9 -char * fsSubtitleFilterNames[fsNumberOfSubtitleFilterNames+1][2] = +char * fsSubtitleFilterNames[][2] = { { "UTF (*.utf)", "*.utf" }, { "SUB (*.sub)", "*.sub" }, { "SRT (*.srt)", "*.str" }, @@ -64,27 +68,35 @@ char * fsSubtitleFilterNames[fsNumberOfSubtitleFilterNames+1][2] = { "SSA (*.ssa)", "*.ssa" }, { "AQT (*.aqt)", "*.aqt" }, { "Subtitles (*.utf,*.sub,*.srt,*.smi,*.rt,*.txt,*.ssa,*.aqt)", "*.utf,*.sub,*.srt,*.smi,*.rt,*.txt,*.ssa,*.aqt" }, - { "All files ( * )", "*" } }; - -#define fsNumberOfOtherFilterNames 0 -char * fsOtherFilterNames[fsNumberOfOtherFilterNames+1][2] = - { { "All files ( * )", "*" } }; + { "All files ( * )", "*" }, + { NULL,NULL } + }; + +char * fsOtherFilterNames[][2] = + { + { "All files ( * )", "*" }, + { NULL,NULL } + }; -#define fsNumberOfAudioFilterNames 3 -char * fsAudioFileNames[fsNumberOfAudioFilterNames+1][2] = - { { "WAV files (*.wav)", "*.wav" }, +char * fsAudioFileNames[][2] = + { + { "WAV files (*.wav)", "*.wav" }, { "MP3 files (*.mp2, *.mp3)", "*.mp2,*.mp3" }, { "Audio files (*.wav,*.mp2,*.mp3)", "*.wav,*.mp2,*.mp3" }, - { "All files ( * )", "*" } }; + { "All files ( * )", "*" }, + { NULL, NULL } + }; -#define fsNumberOfFontFilterNames 1 -char * fsFontFileNames[fsNumberOfFontFilterNames+1][2] = +char * fsFontFileNames[][2] = + { #ifdef HAVE_FREETYPE - { { "font files (*.ttf)", "*.ttf" }, + { "font files (*.ttf)", "*.ttf" }, #else - { { "font files (*.desc)", "*.desc" }, + { "font files (*.desc)", "*.desc" }, #endif - { "All files ( * )", "*" } }; + { "All files ( * )", "*" }, + { NULL,NULL } + }; GtkWidget * fsFileNamesList; GtkWidget * fsFNameList; @@ -100,13 +112,25 @@ GList * fsTopList_items = NULL; GtkWidget * List; GtkWidget * fsFilterCombo; - GtkStyle * style; GdkPixmap * dpixmap; GdkPixmap * fpixmap; GdkBitmap * dmask; GdkBitmap * fmask; +static char * Filter( char * name ) +{ + char tmp[32]; + int i,c; + for ( i=0,c=0;i < strlen( name );i++ ) + { + if ( ( name[i] >='a' )&&( name[i] <= 'z' ) ) { tmp[c++]='['; tmp[c++]=name[i]; tmp[c++]=name[i] - 32; tmp[c++]=']'; } + else tmp[c++]=name[i]; + } + tmp[c]=0; + return tmp; +} + void CheckDir( GtkWidget * list,char * directory ) { struct stat fs; @@ -157,11 +181,11 @@ void CheckDir( GtkWidget * list,char * directory ) { tmp[c]=0; c=-1; // printf( "substr: %s\n",tmp ); - glob( tmp,glob_param,NULL,&gg ); + glob( Filter( tmp ),glob_param,NULL,&gg ); glob_param=GLOB_APPEND; } } - } else glob( fsFilter,0,NULL,&gg ); + } else glob( Filter( fsFilter ),0,NULL,&gg ); #if 0 if ( !strcmp( fsFilter,"*" ) ) @@ -213,51 +237,51 @@ void ShowFileSelect( int type,int modal ) case fsVideoSelector: gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_FileSelect ); fsList_items=NULL; - for( i=0;ientry; gtk_widget_set_name( fsFilterCombo,"fsFilterCombo" ); @@ -688,7 +707,6 @@ GtkWidget * create_FileSelect( void ) gtk_object_set_data_full( GTK_OBJECT( fsFileSelect ),"fsFilterCombo",fsFilterCombo,(GtkDestroyNotify)gtk_widget_unref ); gtk_widget_show( fsFilterCombo ); gtk_entry_set_editable (GTK_ENTRY( fsFilterCombo ),FALSE ); - gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsVideoFilterNames[fsNumberOfVideoFilterNames - 1][0] ); hseparator3=gtk_hseparator_new(); gtk_widget_set_name( hseparator3,"hseparator3" ); diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 0a91de2d78..6c00668055 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -265,6 +265,7 @@ void ShowPreferences( void ) GList * Items = NULL; char * name = NULL; + Items=g_list_append( Items,MSGTR_PREFERENCES_None ); for( i=0;mpcodecs_vd_drivers[i];i++ ) { Items=g_list_append( Items,(char *)mpcodecs_vd_drivers[i]->info->name ); @@ -279,6 +280,7 @@ void ShowPreferences( void ) GList * Items = NULL; char * name = NULL; + Items=g_list_append( Items,MSGTR_PREFERENCES_None ); for( i=0;mpcodecs_ad_drivers[i];i++ ) { Items=g_list_append( Items,(char *)mpcodecs_ad_drivers[i]->info->name ); -- cgit v1.2.3