From 8b5efd6455370c02211f9fec2a3dbb74f5d0fcbc Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Tue, 25 Oct 2011 07:05:47 +0300
Subject: libmenu: remove OSD menu functionality (--menu)

Something like the OSD menu functionality could be useful. However the
current implementation has several problems and would require a
relatively large amount of work to get into good shape. As far as I
know there are few users of the existing functionality. Nobody is
working on the existing code and keeping it compiling at all while
changing other code would require extra work. So delete the menu code
and some related code elsewhere that's used by nothing else.
---
 etc/dvb-menu.conf | 106 --------------------------------------
 etc/input.conf    |  27 ----------
 etc/menu.conf     | 151 ------------------------------------------------------
 3 files changed, 284 deletions(-)
 delete mode 100644 etc/dvb-menu.conf
 delete mode 100644 etc/menu.conf

(limited to 'etc')

diff --git a/etc/dvb-menu.conf b/etc/dvb-menu.conf
deleted file mode 100644
index 7da289048e..0000000000
--- a/etc/dvb-menu.conf
+++ /dev/null
@@ -1,106 +0,0 @@
-
-<txt name="man" file="manpage.txt"/>
-
-<filesel name="open_file"/>
-<filesel name="open_list" file-action="loadlist '%p'" auto-close="yes"
-	 title="Open a playlist: %p" />
-
-<dvbsel title="Channel List" name="dvbsel" />
-
-
-<pt name="jump_to"/>
-
-<console name="console0" height="80" vspace="0">Welcome to MPlayer</console>
-
-<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" />
-</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>
-
-<pref name="audio_pref" title="Audio">
-      <e name="abs"/>
-      <e name="af"/>
-      <e name="ao"/>
-      <e name="delay"/>
-      <e name="mixer"/>
-</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="icelayer"/>
-      <e name="noslices"/>
-      <e name="panscan"/>
-      <e name="rootwin"/>
-      <e name="saturation"/>
-      <e name="vm"/>
-      <e name="vo"/>
-      <e name="vf"/>
-      <e name="xineramascreen"/>
- </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"/>
-</cmdlist>
-
-<cmdlist name="main" title="MPlayer OSD menu" ptr="<>" >
-      <e name="Pause" ok="pause"/>
-      <e name="Prev/Next" ok="pt_step 1" cancel="pt_step -1"/>
-      <e name="Jump to ..." ok="set_menu jump_to"/>
-      <e name="Open ..." ok="set_menu open_file"/>
-      <e name="Open playlist ..." ok="set_menu open_list"/>
-      <e name="DVB" ok="set_menu dvbsel"/>
-      <e name="Help" ok="set_menu man"/>
-      <e name="Pref" ok="set_menu pref_main"/>
-      <e name="Console" ok="set_menu console0"/>
-      <e name="Quit" ok="quit"/>
-</cmdlist>
diff --git a/etc/input.conf b/etc/input.conf
index 45b20f9b23..509f1bf876 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -109,14 +109,10 @@ JOY_BTN0 pause
 JOY_BTN1 osd
 JOY_BTN2 volume 1
 JOY_BTN3 volume -1
-JOY_BTN4 set_menu main
 
 ##
 ## Apple Remote section
 ##
-## To use OSD menu with Apple Remote, set key AR_MENU to any OSD menu command,
-## or just comment out the 'AR_MENU osd' line and uncomment the line after it.
-##
 
 AR_PLAY pause
 AR_PLAY_HOLD quit
@@ -124,33 +120,10 @@ AR_NEXT seek 30
 AR_NEXT_HOLD seek 120
 AR_PREV seek -10
 AR_PREV_HOLD seek -120
-AR_MENU menu up
-#AR_MENU menu cancel
 AR_MENU_HOLD mute
 AR_VUP volume 1
 AR_VDOWN volume -1
 
-##
-## OSD Menu movement keys
-##
-## If you are using only the keyboard it is enough to define one command (like
-## "menu up"), because then that single key will display the menu, which can
-## then be navigated with the cursor keys and ENTER (defined in menu.conf).
-##
-## LIRC users should bind each "menu" command to a button on their remote.
-##
-## The set_menu command directly displays the (sub)menu specified as
-## its argument. Usage should be self-explanatory (although not likely
-## to be needed), after reading input.conf.
-##
-
-#MOUSE_BTN0 menu up
-#y menu down
-#y menu ok
-#y menu cancel
-#y menu hide
-#y set_menu general_pref
-
 ##
 ## DVDNAV
 ## Requires dvdnav://
diff --git a/etc/menu.conf b/etc/menu.conf
deleted file mode 100644
index 635a2f2a1c..0000000000
--- a/etc/menu.conf
+++ /dev/null
@@ -1,151 +0,0 @@
-<keybindings name="default">
-    <binding key="UP" cmd="menu up" />
-    <binding key="DOWN" cmd="menu down" />
-    <binding key="LEFT" cmd="menu left" />
-    <binding key="RIGHT" cmd="menu right" />
-    <binding key="ENTER" cmd="menu ok" />
-    <binding key="ESC" cmd="menu cancel" />
-    <binding key="HOME" cmd="menu home" />
-    <binding key="END" cmd="menu end" />
-    <binding key="PGUP" cmd="menu pageup" />
-    <binding key="PGDWN" cmd="menu pagedown" />
-    <binding key="JOY_UP" cmd="menu up" />
-    <binding key="JOY_DOWN" cmd="menu down" />
-    <binding key="JOY_LEFT" cmd="menu left" />
-    <binding key="JOY_RIGHT" cmd="menu right" />
-    <binding key="JOY_BTN0" cmd="menu ok" />
-    <binding key="JOY_BTN1" cmd="menu cancel" />
-    <binding key="AR_VUP" cmd="menu up" />
-    <binding key="AR_VDOWN" cmd="menu down" />
-    <binding key="AR_PREV" cmd="menu left" />
-    <binding key="AR_NEXT" cmd="menu right" />
-    <binding key="AR_PLAY" cmd="menu ok" />
-    <binding key="AR_MENU" cmd="menu cancel" />
-    <binding key="AR_PREV_HOLD" cmd="menu home" />
-    <binding key="AR_NEXT_HOLD" cmd="menu end" />
-    <binding key="MOUSE_BTN0" cmd="menu click" />
-    <binding key="MOUSE_BTN2" cmd="menu cancel" />
-</keybindings>
-<keybindings name="list" parent="default">
-    <binding key="AR_PREV" cmd="menu pageup" />
-    <binding key="AR_NEXT" cmd="menu pagedown" />
-</keybindings>
-<keybindings name="filesel" parent="list">
-    <binding key="BS" cmd="menu left" />
-</keybindings>
-<keybindings name="chapsel" parent="list" />
-<keybindings name="cmdlist" parent="list">
-    <binding key="AR_PREV" cmd="menu left" />
-    <binding key="AR_NEXT" cmd="menu right" />
-</keybindings>
-<keybindings name="txt" parent="list" />
-<keybindings name="pt" parent="list" />
-<keybindings name="pref" parent="list">
-    <binding key="AR_PREV" cmd="menu left" />
-    <binding key="AR_NEXT" cmd="menu right" />
-    <binding key="AR_PREV_HOLD" cmd="menu left" />
-    <binding key="AR_NEXT_HOLD" cmd="menu right" />
-</keybindings>
-
-<txt name="man" file="manpage.txt"/>
-
-<filesel name="open_file"/>
-<filesel name="open_list" file-action="loadlist '%p'"
-	 title="Open a playlist: %p"
-	 filter="/etc/mplayer/extensions_filter"
-	 actions="d:run 'mp_loader \'%p\' d',c:run 'mp_loader \'%p\' c'" />
-
-<chapsel name="select_chapter" />
-
-<pt name="jump_to"/>
-
-<console name="console0" height="80" vspace="0">Welcome to MPlayer</console>
-
-<txt name="man" file="manpage.txt"/>
-
-<pref name="general_pref" title="General">
-      <e property="osdlevel" name="OSD level"/>
-      <e property="speed" name="Speed"/>
-      <e property="loop" name="Loop"/>
-</pref>
-
-<pref name="demuxer_pref" title="Demuxer">
-</pref>
-
-
-<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"/>
-      <e property="sub_scale" name="Scale"/>
-</pref>
-
-<pref name="audio_pref" title="Audio">
-      <e property="volume" name="Volume"/>
-      <e property="balance" name="Balance"/>
-      <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 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="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>
-
-<pref name="properties" title="Stream Properties">
-      <e txt="${filename}" name="Name"/>
-      <e txt="${video_format}" name="Video Codec"/>
-      <e txt="${video_bitrate}" name="Video Bitrate"/>
-      <e txt="${width} x ${height}" name="Resolution"/>
-      <e txt="${audio_codec}" name="Audio Codec"/>
-      <e txt="${audio_bitrate}" name="Audio Bitrate"/>
-      <e txt="${samplerate}, ${channels}" name="Audio Samples"/>
-      <e txt="${metadata/Title}" name="Title"/>
-      <e txt="${metadata/Artist}" name="Artist"/>
-      <e txt="${metadata/Album}" name="Album"/>
-      <e txt="${metadata/Year}" name="Year"/>
-      <e txt="${metadata/Comment}" name="Comment"/>
-      <e txt="${metadata/Track}" name="Track"/>
-      <e txt="${metadata/Genre}" name="Genre"/>
-      <e txt="${metadata/Software}" name="Software"/>
-</pref>
-
-<cmdlist name="main" title="MPlayer OSD menu" ptr="<>" >
-      <e name="Pause" ok="pause"/>
-      <e name="Chapter ..." ok="set_menu select_chapter"
-                            left="seek_chapter -1" right="seek_chapter +1"/>
-      <e name="Prev/Next ..." ok="set_menu jump_to"
-                            left="pt_step -1" right="pt_step 1"/>
-      <e name="Open ..." ok="set_menu open_file"/>
-      <e name="Open playlist ..." ok="set_menu open_list"/>
-      <e name="Help" ok="set_menu man"/>
-      <e name="Pref" ok="set_menu pref_main"/>
-      <e name="Properties" ok="set_menu properties"/>
-      <e name="Console" ok="set_menu console0"/>
-      <e name="Quit" ok="quit"/>
-</cmdlist>
-- 
cgit v1.2.3