diff gui/ui/gtk/preferences.c @ 34454:5a45efc630b8

Remove all unnecessary #ifdefs from GUI code. Move or add necessary ones.

--- a/gui/ui/gtk/preferences.c	Thu Jan 12 10:07:22 2012 +0000
+++ b/gui/ui/gtk/preferences.c	Thu Jan 12 10:08:25 2012 +0000
@@ -184,10 +184,8 @@
 static char * vo_driver[3];
 static int    old_video_driver = 0;
 
-#ifdef CONFIG_DXR3
  void ShowDXR3Config( void );
  void HideDXR3Config( void );
-#endif
  void ShowAudioConfig( void );
  void HideAudioConfig( void );
 
@@ -1474,6 +1472,7 @@
 }
 #endif
 
+#if defined(CONFIG_OSS_AUDIO) || defined(CONFIG_ALSA) || defined(CONFIG_SDL) || defined (CONFIG_ESD)
 // Gets text string from a gtk entry, interpreting
 // MSGTR_PREFERENCES_DriverDefault as null string.
 static const char *getGtkEntryText(GtkWidget *from)
@@ -1494,6 +1493,7 @@
   }
   gtk_entry_set_text(GTK_ENTRY(dest),to);
 }
+#endif
 
        GtkWidget *AudioConfig;
 static GtkWidget *CEAudioDevice;
@@ -1706,7 +1706,6 @@
   return AudioConfig;
 }
 
-#ifdef CONFIG_DXR3
 // --- dxr3 config box
 
 static GtkWidget * DXR3Config;
@@ -1826,5 +1825,3 @@
 
  return DXR3Config;
 }
-
-#endif