summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-27 11:04:30 +0200
committerwm4 <wm4@nowhere>2017-06-27 11:04:30 +0200
commit24b2d672ee08c1cabf042d5acfcd466c3214b0a2 (patch)
tree70370de94ee3481fbc9809154cd5586b33ccdf37
parentdb36aa06f479aa5374b961b05c295e24b9cca629 (diff)
downloadmpv-24b2d672ee08c1cabf042d5acfcd466c3214b0a2.tar.bz2
mpv-24b2d672ee08c1cabf042d5acfcd466c3214b0a2.tar.xz
input.conf: drop TV/DVB bindings
Is anyone still using them? Well, I'm removing them anyway.
-rw-r--r--DOCS/man/mpv.rst9
-rw-r--r--etc/input.conf8
-rw-r--r--etc/restore-old-bindings.conf7
3 files changed, 8 insertions, 16 deletions
diff --git a/DOCS/man/mpv.rst b/DOCS/man/mpv.rst
index 0967ae045f..1da99715dc 100644
--- a/DOCS/man/mpv.rst
+++ b/DOCS/man/mpv.rst
@@ -218,14 +218,9 @@ STOP
PREVIOUS and NEXT
Seek backward/forward 1 minute.
-(The following keys are only valid if you compiled with TV or DVB input
-support.)
-h and k
- Select previous/next tv-channel.
-
-H and K
- Select previous/next dvb-channel.
+If you miss some older key bindings, look at ``etc/restore-old-bindings.conf``
+in the mpv git repository.
Mouse Control
-------------
diff --git a/etc/input.conf b/etc/input.conf
index 983c2d5e04..bf679b4017 100644
--- a/etc/input.conf
+++ b/etc/input.conf
@@ -161,14 +161,6 @@
#AR_VDOWN add volume -2
#AR_VDOWN_HOLD add chapter -1
-# For tv://
-#h cycle tv-channel -1 # previous channel
-#k cycle tv-channel +1 # next channel
-
-# For dvb://
-#H cycle dvb-channel-name -1 # previous channel
-#K cycle dvb-channel-name +1 # next channel
-
#
# Legacy bindings (may or may not be removed in the future)
#
diff --git a/etc/restore-old-bindings.conf b/etc/restore-old-bindings.conf
index e2aef8a551..d09051e249 100644
--- a/etc/restore-old-bindings.conf
+++ b/etc/restore-old-bindings.conf
@@ -9,7 +9,12 @@
#
# Older installations use ~/.mpv/input.conf instead.
-# changed in mpv 0.25.0
+# changed in mpv 0.26.0
+
+h cycle tv-channel -1 # previous channel
+k cycle tv-channel +1 # next channel
+H cycle dvb-channel-name -1 # previous channel
+K cycle dvb-channel-name +1 # next channel
I show-text "${filename}" # display filename in osd