From 9b5a7241e88f8147a391f1bb79ce01593a02d443 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 24 Mar 2015 16:02:48 +0100
Subject: input: remove Linux joystick support

Why did this exist in the first place? Other than being completely
useless, this even caused some regressions in the past. For example,
there was the case of a laptop exposing its accelerometer as joystick
device, which led to extremely fun things due to the default mappings of
axis movement being mapped to seeking.

I suppose those who really want to use their joystick to control a media
player (???) can configure it as mouse device or so.
---
 etc/input.conf         | 14 --------------
 etc/mplayer-input.conf | 16 ----------------
 2 files changed, 30 deletions(-)

(limited to 'etc')

diff --git a/etc/input.conf b/etc/input.conf
index f30eb977c5..02b396956f 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -159,20 +159,6 @@
 #AR_VDOWN add volume -2
 #AR_VDOWN_HOLD add chapter -1
 
-# Joystick section
-# WARNING: joystick support has to be explicitly enabled at
-#          compiletime with --enable-joystick
-#
-
-#JOY_AXIS0_PLUS seek 10
-#JOY_AXIS0_MINUS seek -10
-#JOY_AXIS1_MINUS seek 60
-#JOY_AXIS1_PLUS seek -60
-#JOY_BTN0 cycle pause
-#JOY_BTN1 cycle osd
-#JOY_BTN2 add volume 2
-#JOY_BTN3 add volume -2
-
 # For dvdnav:// and bdnav://
 
 # navigation controls during playback
diff --git a/etc/mplayer-input.conf b/etc/mplayer-input.conf
index 0837039fe3..de60fdcca9 100644
--- a/etc/mplayer-input.conf
+++ b/etc/mplayer-input.conf
@@ -74,22 +74,6 @@ l cycle tv-channel -1
 n cycle tv-norm
 #b tv_step_chanlist
 
-##
-## Joystick section
-## WARNING: joystick support has to be explicitly enabled at
-##          compiletime with --enable-joystick
-##
-
-JOY_RIGHT seek 10
-JOY_LEFT seek -10
-JOY_UP seek 60
-JOY_DOWN seek -60
-JOY_BTN0 cycle pause
-JOY_BTN1 osd
-JOY_BTN2 add volume 1
-JOY_BTN3 add volume -1
-#JOY_BTN4 set_menu main
-
 ##
 ## Apple Remote section
 ##
-- 
cgit v1.2.3