[MPlayer-cvslog] CVS: main/etc menu.conf,1.6,1.7

[Alban Bedel CVS]

CVS change done by Alban Bedel CVS

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

Modified Files:
	menu.conf 
Log Message:
Turn the preferences menu in something usefull using the new
property API.


Index: menu.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/menu.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- menu.conf	22 Jan 2005 15:47:34 -0000	1.6
+++ menu.conf	25 Mar 2006 20:49:35 -0000	1.7
@@ -12,80 +12,54 @@
 <txt name="man" file="manpage.txt"/>
 
 <pref name="general_pref" title="General">
-      <e name="autoq"/>
-      <e name="autosync" />
-      <e name="framedrop"/>
-      <e name="quiet"/>
-      <e name="softsleep" />
+      <e property="osdlevel" name="OSD level"/>
+      <e property="speed" name="Speed"/>
 </pref>
 
 <pref name="demuxer_pref" title="Demuxer">
-      <e name="aid"/>
-      <e name="alang" />
-      <e name="cache"/>
-      <e name="channels"/>
-      <e name="dvdangle" />
-      <e name="forceidx"/>
-      <e name="fps"/>
-      <e name="hr-mp3-seek"/>
-      <e name="idx"/>
-      <e name="mc"/>
-      <e name="ni"/>
-      <e name="nobps"/>
-      <e name="srate"/>
-      <e name="vid"/>
 </pref>
 
 
-<pref name="osd_sub_pref" title="OSD & Subs">
-      <e name="ffactor"/>
-      <e name="noautosub"/>
-      <e name="osdlevel"/>
-      <e name="sid"/>
-      <e name="slang"/>
-      <e name="subdelay"/>
-      <e name="subfps"/>
-      <e name="subpos"/>
-      <e name="unicode"/>
-      <e name="utf8"/>
-      <e name="vobsubid"/>
+<pref name="osd_sub_pref" title="Subtitles">
+      <e property="sub" name="Subtitles"/>
+      <e property="sub_visibility" name="Visibility"/>
+      <e property="sub_forced_only" name="Forced sub only"/>
+      <e property="sub_alignment" name="Alignment"/>   
+      <e property="sub_pos" name="Position"/>
+      <e property="sub_delay" name="Delay"/>
 </pref>
 
 <pref name="audio_pref" title="Audio">
-      <e name="abs"/>
-      <e name="af"/>
-      <e name="ao"/>
-      <e name="delay"/>
-      <e name="mixer"/>
+      <e property="volume" name="Volume"/>
+      <e property="mute" name="Mute"/>
+      <e property="audio_delay" name="Delay"/>
+</pref>
+
+<pref name="colors_pref" title="Colors">
+      <e property="gamma" name="Gamma"/>
+      <e property="brightness" name="Brightness"/>
+      <e property="contrast" name="Contrast"/>
+      <e property="saturation" name="Saturation"/>
+      <e property="hue" name="Hue"/>
 </pref>
 
 <pref name="video_pref" title="Video">
-      <e name="bpp"/>
-      <e name="brightness"/>
-      <e name="contrast"/>
-      <e name="display"/>
-      <e name="double"/>
-      <e name="dr"/>
-      <e name="fs"/>
-      <e name="geometry"/>
-      <e name="hue"/>
-      <e name="noslices"/>
-      <e name="panscan"/>
-      <e name="rootwin"/>
-      <e name="saturation"/>
-      <e name="vm"/>
-      <e name="vo"/>
-      <e name="vf"/>
-      <e name="xineramascreen"/>
+      <e property="fullscreen" name="Fullscreen"/>
+      <e property="panscan" name="Panscan"/>
+      <menu menu="colors_pref" name="Colors ..."/>
+      <e property="ontop" name="Always on top"/>
+      <e property="rootwin" name="Root window"/>
+      <e property="framedropping" name="Frame dropping"/>
+      <e property="vsync" name="VSync"/>
  </pref>
 
 
 <cmdlist name="pref_main" title="Preferences" ptr="<>" >
     <e name="General ..." ok="set_menu general_pref"/>
-    <e name="Demuxer ..." ok="set_menu demuxer_pref"/>
-    <e name="Osd/Subtitles ..." ok="set_menu osd_sub_pref"/>
     <e name="Audio ..." ok="set_menu audio_pref"/>
     <e name="Video ..." ok="set_menu video_pref"/>
+    <e name="Subtitles ..." ok="set_menu osd_sub_pref"/>
+    <e name="Back" ok="menu cancel"/>
 </cmdlist>
 
 <cmdlist name="main" title="MPlayer OSD menu" ptr="<>" >