[MPlayer-cvslog] r25372 - in trunk/etc: input.conf menu.conf

[ulion]

Author: ulion
Date: Wed Dec 12 05:00:07 2007
New Revision: 25372

Log:
Add OSD menu keybindings for Apple Remote.
Since libmenu is still not enabled by default, we do not change default command
of Apple Remote input, only add a comment for using OSD menu with Apple Remote.



Modified:
   trunk/etc/input.conf
   trunk/etc/menu.conf

Modified: trunk/etc/input.conf
==============================================================================
--- trunk/etc/input.conf	(original)
+++ trunk/etc/input.conf	Wed Dec 12 05:00:07 2007
@@ -103,6 +103,9 @@ 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
@@ -111,6 +114,7 @@ AR_NEXT_HOLD seek 120
 AR_PREV seek -10
 AR_PREV_HOLD seek -120
 AR_MENU osd
+#AR_MENU set_menu main
 AR_MENU_HOLD mute
 AR_VUP volume 1
 AR_VDOWN volume -1

Modified: trunk/etc/menu.conf
==============================================================================
--- trunk/etc/menu.conf	(original)
+++ trunk/etc/menu.conf	Wed Dec 12 05:00:07 2007
@@ -15,15 +15,34 @@
     <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" />
+</keybindings>
+<keybindings name="list" parent="default">
+    <binding key="AR_PREV" cmd="menu pageup" />
+    <binding key="AR_NEXT" cmd="menu pagedown" />
 </keybindings>
-<keybindings name="list" parent="default" />
 <keybindings name="filesel" parent="list">
     <binding key="BS" cmd="menu left" />
 </keybindings>
-<keybindings name="cmdlist" 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" />
+<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"/>