Mercurial > mplayer.hg
changeset 33776:4fae8b19fbbd
Remove member Othername from struct guiInterface_t.
Comment unused code related to the member.
| author | ib |
|---|---|
| date | Sun, 10 Jul 2011 12:11:03 +0000 |
| parents | b42abb9c7f2c |
| children | 235c6f2514be |
| files | gui/interface.h gui/ui/gtk/fileselect.c gui/ui/gtk/fileselect.h |
| diffstat | 3 files changed, 7 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.h Sun Jul 10 12:01:39 2011 +0000 +++ b/gui/interface.h Sun Jul 10 12:11:03 2011 +0000 @@ -132,8 +132,6 @@ char *Subtitlename; - char *Othername; - char *AudioFile; } guiInterface_t;
--- a/gui/ui/gtk/fileselect.c Sun Jul 10 12:01:39 2011 +0000 +++ b/gui/ui/gtk/fileselect.c Sun Jul 10 12:11:03 2011 +0000 @@ -279,7 +279,7 @@ gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsSubtitleFilterNames[k >= 0 ? k : i-2][0] ); tmp=guiInfo.Subtitlename; break; - case fsOtherSelector: +/* case fsOtherSelector: gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_OtherSelect ); fsList_items=NULL; for( i=0;fsOtherFilterNames[i][0];i++ ) @@ -288,7 +288,7 @@ g_list_free( fsList_items ); gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsOtherFilterNames[0][0] ); tmp=guiInfo.Othername; - break; + break;*/ case fsAudioSelector: gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_AudioFileSelect ); fsList_items=NULL; @@ -406,11 +406,11 @@ if( !strcmp( str,fsSubtitleFilterNames[i][0] ) ) { fsFilter=fsSubtitleFilterNames[i][1]; fsLastSubtitleFilterSelected = i; break; } break; - case fsOtherSelector: +/* case fsOtherSelector: for( i=0;fsOtherFilterNames[i][0];i++ ) if( !strcmp( str,fsOtherFilterNames[i][0] ) ) { fsFilter=fsOtherFilterNames[i][1]; break; } - break; + break;*/ case fsAudioSelector: for( i=0;fsAudioFileNames[i][0];i++ ) if( !strcmp( str,fsAudioFileNames[i][0] ) ) @@ -490,9 +490,9 @@ setddup( &guiInfo.Subtitlename,fsSelectedDirectory,fsSelectedFile ); mplayerLoadSubtitle( guiInfo.Subtitlename ); break; - case fsOtherSelector: +/* case fsOtherSelector: setddup( &guiInfo.Othername,fsSelectedDirectory,fsSelectedFile ); - break; + break;*/ case fsAudioSelector: setddup( &guiInfo.AudioFile,fsSelectedDirectory,fsSelectedFile ); break;
--- a/gui/ui/gtk/fileselect.h Sun Jul 10 12:01:39 2011 +0000 +++ b/gui/ui/gtk/fileselect.h Sun Jul 10 12:11:03 2011 +0000 @@ -23,7 +23,7 @@ #define fsVideoSelector 0 #define fsSubtitleSelector 1 -#define fsOtherSelector 2 +//#define fsOtherSelector 2 #define fsAudioSelector 3 #define fsFontSelector 4