summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-11 21:58:42 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-12-11 21:58:42 +0000
commitf5f37dc414bf21d12ab430d381255fa9685c54e8 (patch)
treef66ef92dec1dd423ff9f7b860edad1121b0d3ae1 /etc
parentd94954cfe6f4fc48cdabdbdb6a804f16a7d89bad (diff)
downloadmpv-f5f37dc414bf21d12ab430d381255fa9685c54e8.tar.bz2
mpv-f5f37dc414bf21d12ab430d381255fa9685c54e8.tar.xz
allow osd menu being controlled by joystick
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25365 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'etc')
-rw-r--r--etc/input.conf1
-rw-r--r--etc/menu.conf6
2 files changed, 7 insertions, 0 deletions
diff --git a/etc/input.conf b/etc/input.conf
index 3094d7dec6..bbfe422e4c 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -98,6 +98,7 @@ JOY_BTN0 pause
JOY_BTN1 osd
JOY_BTN2 volume 1
JOY_BTN3 volume -1
+JOY_BTN4 set_menu main
##
## Apple Remote section
diff --git a/etc/menu.conf b/etc/menu.conf
index f43a5be326..6bc191cbfd 100644
--- a/etc/menu.conf
+++ b/etc/menu.conf
@@ -9,6 +9,12 @@
<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" />
</keybindings>
<keybindings name="list" parent="default" />
<keybindings name="filesel" parent="list">