2 files changed, 0 insertions, 22 deletions
diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c
index 714ea7b4b1..17801ed5eb 100644
--- a/Gui/mplayer/gtk/fs.c
+++ b/Gui/mplayer/gtk/fs.c
@@ -496,12 +496,10 @@ void fs_Ok_released( GtkButton * button,gpointer user_data )
 	  gfree( (void **)&guiIntfStruct.Subtitlename );
           fs_PersistantHistory( fsSelectedDirectory );      //totem, write into history
           break;
-#ifdef USE_SUB
    case fsSubtitleSelector:
           guiSetDF( guiIntfStruct.Subtitlename,fsSelectedDirectory,fsSelectedFile );
 	  guiLoadSubtitle( guiIntfStruct.Subtitlename );
           break;
-#endif
    case fsOtherSelector:
           guiSetDF( guiIntfStruct.Othername,fsSelectedDirectory,fsSelectedFile );
           break;
@@ -510,9 +508,7 @@ void fs_Ok_released( GtkButton * button,gpointer user_data )
           break;
    case fsFontSelector:
           guiSetDF( font_name,fsSelectedDirectory,fsSelectedFile );
-#if defined( USE_OSD ) || defined( USE_SUB )
 	  guiLoadFont();
-#endif
 	  if ( Preferences ) gtk_entry_set_text( GTK_ENTRY( prEFontName ),font_name );
 	  break;
   }
diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c
index 4b3b45b4b8..ac8597f95b 100644
--- a/Gui/mplayer/gtk/opts.c
+++ b/Gui/mplayer/gtk/opts.c
@@ -400,18 +400,6 @@ void ShowPreferences( void )
   else gtk_entry_set_text( GTK_ENTRY( prECDRomDevice ),DEFAULT_CDROM_DEVICE );
 
 // -- disables
-#ifndef USE_SUB
- gtk_widget_set_sensitive( AConfig,FALSE );
- gtk_widget_set_sensitive( CBNoAutoSub,FALSE );
- gtk_widget_set_sensitive( CBSubOverlap,FALSE );
- gtk_widget_set_sensitive( CBSubUnicode,FALSE );
- gtk_widget_set_sensitive( CBDumpMPSub,FALSE );
- gtk_widget_set_sensitive( CBDumpSrt,FALSE );
- gtk_widget_set_sensitive( HSSubDelay,FALSE );
- gtk_widget_set_sensitive( HSSubPosition,FALSE );
- gtk_widget_set_sensitive( HSSubFPS,FALSE );
-#endif
-
 #ifndef USE_ASS
  gtk_widget_set_sensitive( CBUseASS,FALSE );
  gtk_widget_set_sensitive( CBASSUseMargins,FALSE );
@@ -426,12 +414,6 @@ void ShowPreferences( void )
  gtk_widget_set_sensitive( RBOSDTPTT,FALSE );
 #endif
 
-#if !defined( USE_OSD ) && !defined( USE_SUB )
- gtk_widget_set_sensitive( HSFontFactor,FALSE );
- gtk_widget_set_sensitive( prEFontName,FALSE );
- gtk_widget_set_sensitive( BLoadFont,FALSE );
-#endif
-
 // -- signals
  gtk_signal_connect( GTK_OBJECT( CBExtraStereo ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)0 );
  gtk_signal_connect( GTK_OBJECT( CBNormalize ),"toggled",GTK_SIGNAL_FUNC( prToggled ),(void*)1 );