[MPlayer-cvslog] r33267 - trunk/gui/cfg.c

[ib]

Author: ib
Date: Fri Apr 15 16:34:17 2011
New Revision: 33267

Log:
Group and sort configuration variable definitions.

Modified:
   trunk/gui/cfg.c

Modified: trunk/gui/cfg.c
==============================================================================
--- trunk/gui/cfg.c	Fri Apr 15 16:30:58 2011	(r33266)
+++ trunk/gui/cfg.c	Fri Apr 15 16:34:17 2011	(r33267)
@@ -39,48 +39,56 @@
 #include "sub/font_load.h"
 #include "sub/sub.h"
 
-int gtkEnableAudioEqualizer = 0;
+int gtkCacheOn   = 0;
+int gtkCacheSize = 2048;
 
-int gtkVfPP   = 0;
 int gtkVfLAVC = 0;
+int gtkVfPP   = 0;
+
+#ifdef CONFIG_DXR3
+char *gtkDXR3Device;
+#endif
+
+int gtkAutoSyncOn = 0;
+int gtkAutoSync   = 0;
 
 int gtkAONorm             = 0;
 int gtkAOSurround         = 0;
 int gtkAOExtraStereo      = 0;
 float gtkAOExtraStereoMul = 1.0;
-#ifdef CONFIG_OSS_AUDIO
-char *gtkAOOSSMixer;
-char *gtkAOOSSMixerChannel;
-char *gtkAOOSSDevice;
-#endif
+
 #ifdef CONFIG_ALSA
 char *gtkAOALSAMixer;
 char *gtkAOALSAMixerChannel;
 char *gtkAOALSADevice;
 #endif
-#ifdef CONFIG_SDL
-char *gtkAOSDLDriver;
+
+#ifdef CONFIG_OSS_AUDIO
+char *gtkAOOSSMixer;
+char *gtkAOOSSMixerChannel;
+char *gtkAOOSSDevice;
 #endif
+
 #ifdef CONFIG_ESD
 char *gtkAOESDDevice;
 #endif
 
-int gtkCacheOn   = 0;
-int gtkCacheSize = 2048;
-
-int gtkAutoSyncOn = 0;
-int gtkAutoSync   = 0;
-
-#ifdef CONFIG_DXR3
-char *gtkDXR3Device;
+#ifdef CONFIG_SDL
+char *gtkAOSDLDriver;
 #endif
 
+int gtkEnableAudioEqualizer = 0;
+
 int gtkSubDumpMPSub = 0;
 int gtkSubDumpSrt   = 0;
 
+#ifdef CONFIG_ASS
+gtkASS_t gtkASS;
+#endif
+
+int gtkEnablePlayBar   = 1;
 int gtkLoadFullscreen  = 0;
 int gtkShowVideoWindow = 1;
-int gtkEnablePlayBar   = 1;
 
 int gui_save_pos   = 1;
 int gui_main_pos_x = -2;
@@ -88,10 +96,6 @@ int gui_main_pos_y = -2;
 int gui_sub_pos_x  = -1;
 int gui_sub_pos_y  = -1;
 
-#ifdef CONFIG_ASS
-gtkASS_t gtkASS;
-#endif
-
 static m_config_t *gui_conf;
 
 // NOTE TO MYSELF: Do we really need all/any non-gtkOptions, i.e. override mplayer's ones?