diff options
| author |  wm4 <wm4@nowhere> | 2015-08-03 23:33:03 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-08-03 23:49:14 +0200 |
| commit | f792f56440c33fae4f027518fe999daa9e8d3771 (patch) | |
| tree | abd7fb8f75a17e03a42696631543b4aa8aff2efc /etc | |
| parent | 59d44ecef17790739211c56e7b2ca5c2682d855a (diff) | |
player: remove higher-level remains of DVD/BD menu support
Nobody wanted to restore this, so it gets the boot.
If anyone still wants to volunteer to restore menu support, this would
be welcome. (I might even try it myself if I feel masochistic and like
wasting a lot of time for nothing.) But if it does get restored, it
should be done differently. There were many stupid things about how it
was done. For example, it somehow tried to pull mp_nav_events through
all the layers (including needing to "buffer" them in the demuxer),
which was needlessly complicated. It could be done simpler.
This code was already inactive, so this commit actually changes nothing.
Also keep in mind that normal DVD/BD playback still works.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/input.conf | 14 | ||||
| -rw-r--r-- | etc/mplayer-input.conf | 25 |
2 files changed, 0 insertions, 39 deletions
diff --git a/etc/input.conf b/etc/input.conf index 03e02deda2..b6cc8e76d5 100644 --- a/etc/input.conf +++ b/etc/input.conf @@ -160,20 +160,6 @@ #AR_VDOWN add volume -2 #AR_VDOWN_HOLD add chapter -1 -# For dvdnav:// and bdnav:// - -# navigation controls during playback -#ENTER {discnav} discnav menu # DISCNAV MENU -# BS {discnav} discnav prev # DISCNAV PREVIOUS menu (in the order chapter->title->root) -# navigation controls when showing menu (additionally to the controls above) -#UP {discnav-menu} discnav up # DISCNAV UP -#DOWN {discnav-menu} discnav down # DISCNAV DOWN -#LEFT {discnav-menu} discnav left # DISCNAV LEFT -#RIGHT {discnav-menu} discnav right # DISCNAV RIGHT -#ENTER {discnav-menu} discnav select # DISCNAV SELECT (ok) -#MOUSE_BTN0 {discnav-menu} discnav mouse -#MOUSE_MOVE {discnav-menu} discnav mouse_move - # For tv:// #h cycle tv-channel -1 # previous channel #k cycle tv-channel +1 # next channel diff --git a/etc/mplayer-input.conf b/etc/mplayer-input.conf index de60fdcca9..97eafaefea 100644 --- a/etc/mplayer-input.conf +++ b/etc/mplayer-input.conf @@ -93,31 +93,6 @@ AR_MENU_HOLD cycle mute AR_VUP add volume 1 AR_VDOWN add volume -1 -## -## DVD and Bluray menus -## -## Unlike MPlayer, input doesn't require blocking normal keys when no menu -## is active. The "discnav-menu" input section is active only when a menu -## is shown, while "discnav" is always active when a DVD/Bluray is played. -## -## The bindings were adjusted according to this. -## - -UP {discnav-menu} discnav up # DVDNav UP -DOWN {discnav-menu} discnav down # DVDNav DOWN -LEFT {discnav-menu} discnav left # DVDNav LEFT -RIGHT {discnav-menu} discnav right # DVDNav RIGHT -ESC {discnav} discnav menu # DVDNav MENU -ENTER {discnav-menu} discnav select # DVDNav SELECT (ok) -BS {discnav-menu} discnav prev # DVDNav PREVIOUS menu (in the order chapter->title->root) - -AR_VUP {discnav-menu} discnav up # DVDNav UP -AR_VDOWN {discnav-menu} discnav down # DVDNav DOWN -AR_PREV {discnav-menu} discnav left # DVDNav LEFT -AR_NEXT {discnav-menu} discnav right # DVDNav RIGHT -AR_MENU {discnav} discnav menu # DVDNav MENU -AR_PLAY {discnav-menu} discnav select # DVDNav SELECT (ok) - #? add chapter -1 # skip to previous dvd chapter #? add chapter +1 # next |