[MPlayer-cvslog] CVS: main/etc example.conf,1.68,1.69

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/etc
In directory mail:/var2/tmp/cvs-serv9514

Modified Files:
	example.conf 
Log Message:
Put settings into a more meaningful order, some cosmetics.


Index: example.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/example.conf,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- example.conf	17 Jan 2006 00:36:00 -0000	1.68
+++ example.conf	17 Jan 2006 00:36:52 -0000	1.69
@@ -11,15 +11,37 @@
 # See the CONFIGURATION FILES section in the man page
 # for a detailed description of the syntax.
 
-#
-# video settings
-#
+
+##################
+# video settings #
+##################
 
 # Specify default video driver (see -vo help for a list).
 #vo=xv
 
-# Specify default audio driver (see -ao help for a list).
-#ao=oss
+# Use SDL video with the aalib subdriver by default.
+#vo = sdl:aalib
+
+# FBdev driver:
+#
+# mode to use (read from fb.modes)
+#fbmode = 640x480-120
+#
+# location of the fb.modes file
+#fbmodeconfig = /etc/fb.modes
+
+# Specify your monitor timings for the vesa and fbdev video output drivers.
+# See /etc/X11/XF86Config for timings. Be careful; if you specify settings
+# that exceed the capabilities of your monitor, you may damage it.
+#
+# horizontal frequency range (k stands for 1000)
+#monitor-hfreq = 31.5k-50k,70k
+#
+# vertical frequency range
+#monitor-vfreq = 50-90
+#
+# dotclock (or pixelclock) range (m stands for 1000000)
+#monitor-dotclock = 30M-300M
 
 # Start in fullscreen mode by default.
 #fs=yes
@@ -43,61 +65,42 @@
 # Keep the player window on top of all other windows.
 #ontop=yes
 
-# Specify your preferred skin here (skins are searched for in
-# /usr/local/share/mplayer/Skin/<name> and ~/.mplayer/Skin/<name>).
-#skin = Abyss
+
+##################
+# audio settings #
+##################
+
+# Specify default audio driver (see -ao help for a list).
+#ao=oss
+
+# Use SDL audio driver with the esd subdriver by default.
+#ao = sdl:esd
 
 # Specify the mixer device.
 #mixer = /dev/mixer
 
-#
+# Resample the sound to 44100Hz with the lavcresample audio filter.
+#af=lavcresample=44100
+
+
+##################
+# other settings #
+##################
+
+# Drop frames to preserve audio/video sync.
+#framedrop = yes
+
+# Specify your preferred skin here (skins are searched for in
+# /usr/local/share/mplayer/Skin/<name> and ~/.mplayer/Skin/<name>).
+#skin = Abyss
+
 # Resample the font alphamap.
 # 0     plain white fonts
 # 0.75  very narrow black outline (default)
 # 1     narrow black outline
 # 10    bold black outline
-#
 #ffactor = 0.75
 
-#
-# FBdev driver:
-#
-# mode to use (read from fb.modes)
-#fbmode = 640x480-120
-#
-# location of the fb.modes file
-#fbmodeconfig = /etc/fb.modes
-
-# Specify your monitor timings for the vesa and fbdev video output drivers.
-# See /etc/X11/XF86Config for timings. Be careful; if you specify settings
-# that exceed the capabilities of your monitor, you may damage it.
-#
-# horizontal frequency range (k stands for 1000)
-#monitor-hfreq = 31.5k-50k,70k
-#
-# vertical frequency range
-#monitor-vfreq = 50-90
-#
-# dotclock (or pixelclock) range (m stands for 1000000)
-#monitor-dotclock = 30M-300M
-
-#
-# SDL driver
-#
-# Use SDL video with the aalib subdriver by default.
-#vo = sdl:aalib
-#
-# Use SDL audio driver with the esd subdriver by default.
-#ao = sdl:esd
-
-
-#
-# other settings
-#
-# Drop frames to preserve audio/video sync.
-#framedrop = yes
-
-#
 # cache settings
 #
 # Use 8MB input cache by default.
@@ -116,9 +119,5 @@
 #alang = en
 
 
-# Resample the sound to 44100Hz with the lavcresample audio filter.
-#af=lavcresample=44100
-
-#
 # You can also include other configuration files.
 #include = /path/to/the/file/you/want/to/include