Mercurial > mplayer.hg
comparison Gui/mplayer/gtk/fs.c @ 7540:2a1766fec13e
fix filter handling bug
author | pontscho |
---|---|
date | Sat, 28 Sep 2002 20:33:56 +0000 |
parents | 56ea9db91251 |
children | 85c8a8a8f4fd |
comparison
equal
deleted
inserted
replaced
7539:56ea9db91251 | 7540:2a1766fec13e |
---|---|
31 #endif | 31 #endif |
32 | 32 |
33 gchar * fsSelectedFile = NULL; | 33 gchar * fsSelectedFile = NULL; |
34 gchar * fsSelectedDirectory = NULL; | 34 gchar * fsSelectedDirectory = NULL; |
35 unsigned char * fsThatDir = "."; | 35 unsigned char * fsThatDir = "."; |
36 gchar fsFilter[256] = "*"; | 36 gchar * fsFilter = "*"; |
37 | 37 |
38 int fsPressed = 0; | 38 int fsPressed = 0; |
39 int fsType = 0; | 39 int fsType = 0; |
40 | 40 |
41 int gtkVFileSelect = 0; | 41 int gtkVFileSelect = 0; |
171 gtk_clist_set_pixmap( GTK_CLIST( list ),c++,0,pixmap,mask ); | 171 gtk_clist_set_pixmap( GTK_CLIST( list ),c++,0,pixmap,mask ); |
172 free( str[0][1] ); | 172 free( str[0][1] ); |
173 } | 173 } |
174 globfree( &gg ); | 174 globfree( &gg ); |
175 | 175 |
176 //printf( "fsFiler: '%s'\n",fsFilter ); | |
177 if ( strchr( fsFilter,',' ) ) | 176 if ( strchr( fsFilter,',' ) ) |
178 { | 177 { |
179 char tmp[8]; | 178 char tmp[8]; |
180 int i,c,glob_param = 0; | 179 int i,c,glob_param = 0; |
181 //printf( "sub item detected.\n" ); | 180 //printf( "sub item detected.\n" ); |
333 void fs_fsFileSelect_destroy( GtkObject * object,gpointer user_data ) | 332 void fs_fsFileSelect_destroy( GtkObject * object,gpointer user_data ) |
334 { HideFileSelect(); } | 333 { HideFileSelect(); } |
335 | 334 |
336 void fs_fsFilterCombo_activate( GtkEditable * editable,gpointer user_data ) | 335 void fs_fsFilterCombo_activate( GtkEditable * editable,gpointer user_data ) |
337 { | 336 { |
338 strcpy( fsFilter,gtk_entry_get_text( GTK_ENTRY( user_data ) ) ); | 337 fsFilter=gtk_entry_get_text( GTK_ENTRY( user_data ) ); |
339 CheckDir( fsFNameList,get_current_dir_name() ); | 338 CheckDir( fsFNameList,get_current_dir_name() ); |
340 } | 339 } |
341 | 340 |
342 void fs_fsFilterCombo_changed( GtkEditable * editable,gpointer user_data ) | 341 void fs_fsFilterCombo_changed( GtkEditable * editable,gpointer user_data ) |
343 { | 342 { |
349 switch ( fsType ) | 348 switch ( fsType ) |
350 { | 349 { |
351 case fsVideoSelector: | 350 case fsVideoSelector: |
352 for( i=0;fsVideoFilterNames[i][0];i++ ) | 351 for( i=0;fsVideoFilterNames[i][0];i++ ) |
353 if( !strcmp( str,fsVideoFilterNames[i][0] ) ) | 352 if( !strcmp( str,fsVideoFilterNames[i][0] ) ) |
354 { strcpy( fsFilter,fsVideoFilterNames[i][1] ); break; } | 353 { fsFilter=fsVideoFilterNames[i][1]; break; } |
355 break; | 354 break; |
356 case fsSubtitleSelector: | 355 case fsSubtitleSelector: |
357 for( i=0;fsSubtitleFilterNames[i][0];i++ ) | 356 for( i=0;fsSubtitleFilterNames[i][0];i++ ) |
358 if( !strcmp( str,fsSubtitleFilterNames[i][0] ) ) | 357 if( !strcmp( str,fsSubtitleFilterNames[i][0] ) ) |
359 { strcpy( fsFilter,fsSubtitleFilterNames[i][1] ); break; } | 358 { fsFilter=fsSubtitleFilterNames[i][1]; break; } |
360 break; | 359 break; |
361 case fsOtherSelector: | 360 case fsOtherSelector: |
362 for( i=0;fsOtherFilterNames[i][0];i++ ) | 361 for( i=0;fsOtherFilterNames[i][0];i++ ) |
363 if( !strcmp( str,fsOtherFilterNames[i][0] ) ) | 362 if( !strcmp( str,fsOtherFilterNames[i][0] ) ) |
364 { strcpy( fsFilter,fsOtherFilterNames[i][1] ); break; } | 363 { fsFilter=fsOtherFilterNames[i][1]; break; } |
365 break; | 364 break; |
366 case fsAudioSelector: | 365 case fsAudioSelector: |
367 for( i=0;fsAudioFileNames[i][0];i++ ) | 366 for( i=0;fsAudioFileNames[i][0];i++ ) |
368 if( !strcmp( str,fsAudioFileNames[i][0] ) ) | 367 if( !strcmp( str,fsAudioFileNames[i][0] ) ) |
369 { strcpy( fsFilter,fsAudioFileNames[i][1] ); break; } | 368 { fsFilter=fsAudioFileNames[i][1]; break; } |
370 break; | 369 break; |
371 case fsFontSelector: | 370 case fsFontSelector: |
372 for( i=0;fsFontFileNames[i][0];i++ ) | 371 for( i=0;fsFontFileNames[i][0];i++ ) |
373 if( !strcmp( str,fsFontFileNames[i][0] ) ) | 372 if( !strcmp( str,fsFontFileNames[i][0] ) ) |
374 { strcpy( fsFilter,fsFontFileNames[i][1] ); break; } | 373 { fsFilter,fsFontFileNames[i][1]; break; } |
375 break; | 374 break; |
376 default: return; | 375 default: return; |
377 } | 376 } |
378 CheckDir( fsFNameList,get_current_dir_name() ); | 377 CheckDir( fsFNameList,get_current_dir_name() ); |
379 } | 378 } |