[MPlayer-cvslog] r33864 - in trunk/gui: interface.h ui/gtk/fileselect.c ui/gtk/fileselect.h

[ib]

Author: ib
Date: Sun Jul 10 14:11:03 2011
New Revision: 33864

Log:
Remove member Othername from struct guiInterface_t.

Comment unused code related to the member.

Modified:
   trunk/gui/interface.h
   trunk/gui/ui/gtk/fileselect.c
   trunk/gui/ui/gtk/fileselect.h

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Sun Jul 10 14:01:39 2011	(r33863)
+++ trunk/gui/interface.h	Sun Jul 10 14:11:03 2011	(r33864)
@@ -132,8 +132,6 @@ typedef struct {
 
     char *Subtitlename;
 
-    char *Othername;
-
     char *AudioFile;
 } guiInterface_t;
 

Modified: trunk/gui/ui/gtk/fileselect.c
==============================================================================
--- trunk/gui/ui/gtk/fileselect.c	Sun Jul 10 14:01:39 2011	(r33863)
+++ trunk/gui/ui/gtk/fileselect.c	Sun Jul 10 14:11:03 2011	(r33864)
@@ -279,7 +279,7 @@ void ShowFileSelect( int type,int modal 
         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 @@ void ShowFileSelect( int type,int modal 
         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 @@ static void fs_fsFilterCombo_changed( Gt
            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 @@ static void fs_Ok_released( GtkButton * 
           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;

Modified: trunk/gui/ui/gtk/fileselect.h
==============================================================================
--- trunk/gui/ui/gtk/fileselect.h	Sun Jul 10 14:01:39 2011	(r33863)
+++ trunk/gui/ui/gtk/fileselect.h	Sun Jul 10 14:11:03 2011	(r33864)
@@ -23,7 +23,7 @@
 
 #define fsVideoSelector    0
 #define fsSubtitleSelector 1
-#define fsOtherSelector    2
+//#define fsOtherSelector    2
 #define fsAudioSelector    3
 #define fsFontSelector     4