summaryrefslogtreecommitdiffstats
path: root/etc/input.conf
Commit message (Collapse)AuthorAgeFilesLines
* Remove dvdnav support (DVD menus)wm42012-08-161-14/+0
| | | | | | | | | | | | | | | | When the internal mplayer MPEG demuxer was removed (commit 1fde09db), the default demuxer when using dvdnav was set to libavformat. Now it turns out that this doesn't work with libavformat. It will terminate playback right after the audio runs out (instead of looping it like the video, or whatever it's supposed to do). I'm not sure what exactly the problem is, but since 1. even mplayer-svn can't handle DVD menus directly (missing highlights), 2. DVD menus are essentially worthless, and 3. I don't directly watch DVDs, don't bother with it and remove it. For basic playback, there's still libdvdread support. Also, use pkg-config for libdvdread, and drop support for in-tree libdvdread. Remove support for in-tree libdvdcss as well.
* input.conf: put dvdnav commands under {dvdnav}wm42012-08-051-8/+8
| | | | | This means these key binding will basically not exist, unless dvdnav is in use (at runtime).
* Remove teletext supportwm42012-08-031-3/+0
| | | | | | | | Teletext requires special OSD support. Because I can't even test teletext, I can't restore support for it. Since teletext can be considered ancient and obscure, and since it doesn't make sense to keep the remaining teletext code without being able to use it, I'm removing it.
* mplayer: turn playtree into a list, and change per-file option handlingwm42012-07-311-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Summary: - There is no playtree anymore. It's reduced to a simple list. - Options are now always global. You can still have per-file options, but these are optional and require special syntax. - The slave command pt_step has been removed, and playlist_next and playlist_prev added. (See etc/input.conf changes.) This is a user visible incompatible change, and will break slave-mode applications. - The pt_clear slave command is renamed to playlist_clear. - Playtree entries could have multiple files. This is not the case anymore, and playlist entries have always exactly one entry. Whenever something adds more than one file (like ASX playlists or dvd:// or dvdnav:// on the command line), all files are added as separate playlist entries. Note that some of the changes are quite deep and violent. Expect regressions. The playlist parsing code in particular is of low quality. I didn't try to improve it, and merely spent to least effort necessary to keep it somehow working. (Especially ASX playlist handling.) The playtree code was complicated and bloated. It was also barely used. Most users don't even know that mplayer manages the playlist as tree, or how to use it. The most obscure features was probably specifying a tree on command line (with '{' and '}' to create/close tree nodes). It filled the player code with complexity and confused users with weird slave commands like pt_up. Replace the playtree with a simple flat playlist. Playlist parsers that actually return trees are changed to append all files to the playlist pre-order. It used to be the responsibility of the playtree code to change per-file config options. Now this is done by the player core, and the playlist code is free of such details. Options are not per-file by default anymore. This was a very obscure and complicated feature that confused even experienced users. Consider the following command line: mplayer file1.mkv file2.mkv --no-audio file3.mkv This will disable the audio for file2.mkv only, because options are per-file by default. To make the option affect all files, you're supposed to put it before the first file. This is bad, because normally you don't need per-file options. They are very rarely needed, and the only reasonable use cases I can imagine are use of the encode backend (mplayer encode branch), or for debugging. The normal use case is made harder, and the feature is perceived as bug. Even worse, correct usage is hard to explain for users. Make all options global by default. The position of an option isn't significant anymore (except for options that compensate each other, consider --shuffle --no-shuffle). One other important change is that no options are reset anymore if a new file is started. If you change settings with slave mode commands, they will not be changed by playing a new file. (Exceptions include settings that are too file specific, like audio/subtitle stream selection.) There is still some need for per-file options. Debugging and encoding are use cases that profit from per-file options. Per-file profiles (as well as per-protocol and per-VO/AO options) need the implementation related mechanisms to backup and restore options when the playback file changes. Simplify the save-slot stuff, which is possible because there is no hierarchical play tree anymore. Now there's a simple backup field. Add a way to specify per-file options on command line. Example: mplayer f1.mkv -o0 --{ -o1 f2.mkv -o2 f3.mkv --} f4.mkv -o3 will have the following options per file set: f1.mkv, f4.mkv: -o0 -o3 f2.mkv, f3.mkv: -o0 -o3 -o1 -o2 The options --{ and --} start and end per-file options. All files inside the { } will be affected by the options equally (similar to how global options and multiple files are handled). When playback of a file starts, the per-file options are set according to the command line. When playback ends, the per-file options are restored to the values when playback started.
* win32: support key modifiers (shift, ctrl, alt)wm42012-04-061-1/+1
| | | | | | | | | | Support for this is rather simple, and some combinations of modifiers and keys don't work. For example, Ctrl+Alt+character is not supported, because Windows doesn't emit a WM_CHAR in this case. Also add support for the pause and print screen keys. Remove the pointless KEY_CTRL translation. Remove KEY_CTRL altogether, because it was not clear what it was actually supposed to mean.
* etc/input.conf: make file contents match default key bindingswm42012-03-251-100/+146
| | | | | | | | | There were some slight differences between what input.conf mapped, and what was in input.c def_cmd_binds[]. Make them match. Add some minor documentation improvements in input.cfg. Also remove double comments ('##'), because they were confusing.
* libmenu: remove OSD menu functionality (--menu)Uoti Urpala2011-10-251-27/+0
| | | | | | | | | | Something like the OSD menu functionality could be useful. However the current implementation has several problems and would require a relatively large amount of work to get into good shape. As far as I know there are few users of the existing functionality. Nobody is working on the existing code and keeping it compiling at all while changing other code would require extra work. So delete the menu code and some related code elsewhere that's used by nothing else.
* options, subs: add --ass-vsfilter-aspect-compatharklu2011-08-121-0/+1
| | | | | | | | | Add option --ass-vsfilter-aspect-compat and corresponding property ass_vsfilter_aspect_compat. The setting controls whether to enable the emulation of traditional VSFilter behavior where subtitles are stretched if the video is anamorphic (previously always enabled for native SSA/ASS subtitles). Enabled by default. Add 'V' as a new default keybinding to toggle the property.
* input: add useful default pointer button bindingsGrigori Goronzy2011-06-141-0/+7
| | | | | | Add two mouse button bindings: 1) left button double click toggles fullscreen 2) right button pauses/unpauses
* input: add default keybindings Shift+[arrow] for small exact seeksUoti Urpala2010-12-201-0/+5
|
* input: support bindings with modifier keys for X inputUoti Urpala2010-12-201-0/+4
| | | | | | | | | | | | | | | | | | | | | Add support for binding commands to modifier+key combinations like "Shift+Left" or "Ctrl+Alt+x", and support reading such combinations from the output window of X VOs. The recognized modifier names are Shift, Ctrl, Alt and Meta. Any combination of those and then a non-modifier key name, separated by '+', is accepted as a key name in input.conf. For non-special keys that produce characters shift is ignored as a modifier. For example "A" is handled as a key without modifiers even if you use shift to write the capital letter; 'a' vs 'A' already distinguishes the combinations with a normal keymap, and having separate 'a', 'Shift+A' and 'A' (written with caps lock for example) would bring more confusion than benefit. Currently reading the modifier+key combinations is only supported in the output window of those VOs that use x11_common.c event handling. It's not possible to input the key combinations in other VOs or in a terminal window.
* Merge svn changes up to r31033Uoti Urpala2010-04-261-0/+1
|\
| * Add osd_show_progression: Show progress bar and elapsed/total time.cehoyos2010-04-091-0/+1
| | | | | | | | | | | | | | Patch by Hugo Chargois, hugo D chargois A free fr git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31028 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove the internal GUIAnton Khirnov2009-07-071-12/+0
| | | | | | | | | | | | | | | | | | The GUI is badly designed and too closely coupled to the internal details of other code. The GUI code is in bad shape and unmaintained for years. There is no indication that anyone would maintain it in the future either. Even if someone did volunteer to implement a better integrated GUI having the current code in the tree probably wouldn't help much. So get rid of it.
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-2/+2
|/
* make = and + both adjust audio delay, useful for keyboards without keypadscompn2009-04-041-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29137 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change DVDNAV command key names.ben2008-06-191-13/+13
| | | | | | | | Parameters now use a string much more intuitive than previous int value. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27100 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make "Menu" button of AppleIR remote call OSD Menu insteadben2008-05-181-1/+1
| | | | | | | | of displaying the OSD status git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26801 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow DVD Menus to be controlled by AppleIR Remote.ben2008-05-181-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26800 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use more intuitive and user-friendly DVDNAV control keys.ben2008-05-131-7/+7
| | | | | | | | | It is particularly useful for laptops users that obviously do not have a keypad ;-) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26761 b3059339-0415-0410-9bf9-f77b7e298cf2
* document ignore optioncompn2008-04-091-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26380 b3059339-0415-0410-9bf9-f77b7e298cf2
* add default deinterlace keycompn2008-01-151-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25759 b3059339-0415-0410-9bf9-f77b7e298cf2
* Change the default osd menu command for AR_MENU in comment of input.conf.ulion2007-12-251-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25525 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add OSD menu keybindings for Apple Remote.ulion2007-12-121-0/+4
| | | | | | | | | 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. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25372 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update comment that navigating keys is defined in menu.conf.ulion2007-12-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25371 b3059339-0415-0410-9bf9-f77b7e298cf2
* allow osd menu being controlled by joystickben2007-12-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25365 b3059339-0415-0410-9bf9-f77b7e298cf2
* Apple Remote supportdiego2007-08-141-0/+15
| | | | | | | | patch by Zoltan Ponekker, pontscho kac.poliod hu cleaned up by Ulion, ulion2002 gmail com with some help by Reimar and me git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24057 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add the sub_scale property and command.albeu2007-07-091-0/+2
| | | | | | | Patch from Anatoli Marinov (anatoli [dot] marinov [at] gmail [dot] com). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23745 b3059339-0415-0410-9bf9-f77b7e298cf2
* The audio balance feature implemented with af_pan.zuxy2007-06-201-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23588 b3059339-0415-0410-9bf9-f77b7e298cf2
* add mute bind which has been default for a while, any other missing defaults?compn2007-03-161-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22632 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove duplicate entrygpoirier2006-12-011-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21407 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix indentation after last commitgpoirier2006-11-301-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21397 b3059339-0415-0410-9bf9-f77b7e298cf2
* add more comments to input.conf, patch by compn % tempn A twmi P rr P com %gpoirier2006-11-301-12/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21396 b3059339-0415-0410-9bf9-f77b7e298cf2
* KP7 bound to dvdnav 7 (previous menu)nicodvb2006-09-101-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19784 b3059339-0415-0410-9bf9-f77b7e298cf2
* added unallocated keys to navigate the dvdnav menusnicodvb2006-09-091-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19776 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a new command: osd_show_property_text that show an expanded propertyalbeu2006-04-231-0/+2
| | | | | | | | string on the OSD. Based on a patch 'by someone named "veal" on irc' that showed the filename. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18223 b3059339-0415-0410-9bf9-f77b7e298cf2
* Switch audio delay keys to something more sane (+ to increase, - to decrease)diego2006-04-151-2/+2
| | | | | | | that happens to also match the documentation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18101 b3059339-0415-0410-9bf9-f77b7e298cf2
* add hint to slave.txtreimar2005-12-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17180 b3059339-0415-0410-9bf9-f77b7e298cf2
* allow changing playback speed during playback.reimar2004-10-201-0/+5
| | | | | | | | | Based on patch by Steve Mueller (diffusor <at> ugcs (dot) caltech [dot] edu), OSD support by Frank Schertan (scherthan (at) uni-landau <dot> de), several modifications by me. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13711 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make '.' key default for framesteppingreimar2004-10-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13643 b3059339-0415-0410-9bf9-f77b7e298cf2
* allow to step only one frame forward by pressing s.reimar2004-10-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13627 b3059339-0415-0410-9bf9-f77b7e298cf2
* runtime 'stay-on-top' functionalityjoey2003-11-301-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11543 b3059339-0415-0410-9bf9-f77b7e298cf2
* Spelling and wording corrections.diego2003-05-051-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10071 b3059339-0415-0410-9bf9-f77b7e298cf2
* panscan keysgabucino2003-01-271-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9118 b3059339-0415-0410-9bf9-f77b7e298cf2
* added sub_stepgabucino2002-12-071-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8400 b3059339-0415-0410-9bf9-f77b7e298cf2
* OSD Menu section, description, sample definesgabucino2002-11-231-0/+21
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8262 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix a typo error with JOY_BTN2 and JOY_BTN3albeu2002-03-191-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5196 b3059339-0415-0410-9bf9-f77b7e298cf2
* ENTER now quits after last filegabucino2002-03-161-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5137 b3059339-0415-0410-9bf9-f77b7e298cf2
* syncgabucino2002-03-151-2/+13
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5114 b3059339-0415-0410-9bf9-f77b7e298cf2
* bindings for subposgabucino2002-03-101-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5018 b3059339-0415-0410-9bf9-f77b7e298cf2
* 'f' and -/+ fixed (noticed by XYZ user)gabucino2002-03-071-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4985 b3059339-0415-0410-9bf9-f77b7e298cf2
* initial version. Needs extending, especially LIRC.gabucino2002-03-011-0/+66
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4910 b3059339-0415-0410-9bf9-f77b7e298cf2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 10:31:53 +0000