summaryrefslogtreecommitdiffstats
path: root/etc
Commit message (Collapse)AuthorAgeFilesLines
* Use - as command-name separator everywhereTimotej Lazar2016-07-143-11/+11
| | | | | | | Old-style commands using _ as separator (e.g. show_progress) were still used in some places, including documentation and configuration files. This commit updates all such instances to the new style (show-progress) so that commands are easier to find in the manual.
* etc/mpv.conf: add missing commentwm42016-05-231-1/+1
| | | | | The config file is an example, and is not supposed to actually define anything by default.
* command: if only ab-loop-b is set, loop from start of filewm42016-04-211-1/+1
| | | | | | | | | | Commit 382bafcb changed the behavior for ab-loop-a. This commit changes ab-loop-b so that the behavior is symmetric. Adjust the OSD rendering accordingly to the two changes. Also fix mentions of the "ab_loop" command to the now preferred "ab-loop".
* mplayer-input.conf: fix input.conf location in commentBen Boeckel2016-03-311-1/+1
|
* mpv.conf: add some more optionswm42016-02-131-0/+8
| | | | | Seems like questions related to functionality covered by them are quite often asked.
* mpv.conf: adjustmentswm42016-02-081-23/+32
| | | | | In particular, get rid of the "vdpau" example profile, as it's pretty useless and misleading.
* player: implement SWITCH for dvb-channel-name property, add binding.Oliver Freyermuth2016-01-141-0/+4
| | | | | | | | The binding is similar to the tv-binding, just with capital letters. Switching the dvb-channel-name property compared to dvb-channel means the channel-name is shown on-screen when switching instead of "dvb-channel (error)" otherwise, and switching anyways happens without changing the card.
* etc: rename "example.conf" to "mpv.conf"Dmitrij D. Czarkoff2016-01-111-0/+0
|
* mpv.desktop: add audio/mp4 mime typewm42016-01-071-1/+1
| | | | Who thought mime types were a good idea?
* example.conf: minor changeswm42015-12-291-12/+10
| | | | | | In particular, the player inserts af_scaletempo by default now when changing speed, so the suggestion to add this was missleading and counter-productive.
* input.conf: remove a redundant and a broken examplewm42015-12-221-2/+0
| | | | | | | window-scale is now mapped to Alt+0 etc. by default (although these bindings just use "set", not "cycle-values"). colormatrix can't be cycled anymore (would require using vf_format).
* input.conf: erase `audio-delay` from `Not assigned by default`openingnow2015-12-221-2/+0
| | | | | | | `ctrl+ +`is assigned as `add audio-delay` by default. Tested by running `mpv --input-test --force-window --idle` Signed-off-by: wm4 <wm4@nowhere>
* input.conf: add default bindings for changing window scalewm42015-11-171-0/+3
| | | | | | These are very much inspired by the hardcoded Cocoa bindings on OSX. Fixes #2500.
* SVG version of the icon (with symbolic counterpart)Evgeny Kolesnikov2015-10-303-0/+352
|
* input.conf: remap d/D keyswm42015-08-042-2/+3
| | | | | | | | | | Drop d for toggling framedrop. Toggling this is way too special to be at such a prominent place, and in fact I believe toggling it is pointless. Remap deinterlacing from D to d. It's relatively useful and non- destructive. As suggested in #973 (almost).
* player: remove higher-level remains of DVD/BD menu supportwm42015-08-032-39/+0
| | | | | | | | | | | | | | | 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.
* manpage: document --audio-channels=auto caveatswm42015-07-251-2/+3
| | | | | | | This is an unfortunate fact of life. Maybe making this the default wasn't such a good idea after all. Also update etc/example.conf. It used an obsolete alias for "auto".
* player: use exit code 0 by default for quit, 4 for signals, etc.Philip Sequeira2015-07-111-4/+4
| | | | | | Default key bindings in encoding mode also use code 4, because scripts will probably want to fail if encoding is aborted (leaving an incomplete file).
* input.conf: invert mouse volume controlMartin Herkt2015-06-301-2/+2
| | | | Scrolling right should increase volume, not decrease it.
* inpout.conf: make shift+o toggle between 2 states onlywm42015-06-032-1/+5
| | | | | | | | | | | | | The "osd" command cycles between 4 states (OSD level 0-3), which is probably confusing and inconvenient. OSD levels 0 and 2 are rarely needed. I would claim there is normally not much of a need to completely disable OSD by setting level 0 during playback. Level 2 is just slightly less information than level 3, and I'm not sure why it exists at all. Change it so that it toggles between level 3 and 1. Note that this ignores the default OSD level. If the default is 3, the first use of this key will set it to 3 again. Just assume 1 is the default. If someone complains, this could be improved.
* input: allow - as separator between commands, instead of _wm42015-05-251-21/+21
| | | | | | | | | | Wnile it seems quite logical to me that commands use _ as word separator, while properties use -, I can't really explain the difference, and it tends to confuse users as well. So always prefer - as separator for everything. Using _ still works, and will probably forever. Not doing so would probably create too much chaos and confusion.
* mpv.desktop: shorten polish nameMateusz Łukasik2015-05-181-1/+1
| | | | | | The Polish name was too long and contradicted. One word is enough. Signed-off-by: wm4 <wm4@nowhere>
* input.conf: add CTRL+s key binding for window screenshotswm42015-05-171-0/+1
|
* input.conf: map L to toggle infinite loopingwm42015-04-271-0/+1
|
* input.conf: unmap menu keywm42015-04-141-1/+0
| | | | | | This was mapped to a broken command, so it did nothing but printing an error message. The intended binding (cycling OSD level) doesn't seem to useful either, so just drop it.
* mpv.desktop: remove NoDisplaywm42015-04-021-1/+0
| | | | | | | | | | The standard say: NoDisplay means "this application exists, but don't display it in the menus". Now that --force-window --idle is enabled, we can remove it. Closes #1755.
* player: add "pseudo-gui" profilewm42015-04-021-1/+1
| | | | | | | | | | | | | | This can be set to select a number of default settings that help mpv pretend that it has a GUI. I haven't decided yet whether I really want to use the profile mechanism for this. There are a number of weird details that are not so easy to handle with profiles, such as disabling pseudo-gui mode again (you can't unset profiles directly). So this might change. But for now it will do. There also should be a better way to store builtin profiles. Unfortunately, the old crappy MPlayer config file parser needs on-disk files, so just use a bunch of function calls for now.
* input: remove Linux joystick supportwm42015-03-242-30/+0
| | | | | | | | | | | 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.
* input.conf: add key binding to override ASS subtitle styleswm42015-03-081-0/+3
|
* input: use flag option type for some input commandswm42015-03-041-5/+5
| | | | | | | | | | This gets rid of the need for a second (or more) parameters; instead it can be all in one parameter. The (now) redundant parameter is still parsed for compatibility, though. The way the flags make each other conflict is a bit tricky: they have overlapping bits, and the option parser disallows setting already set bits.
* etc/input.conf: remove a leftoverwm42015-02-161-2/+0
| | | | This is already mapped by default.
* mpv.desktop: Add zh-TW and zh-CN translationsSkyrainfit2015-02-161-1/+6
|
* input.conf: bind 'A' to cycling aspect ratioswm42015-01-261-0/+2
| | | | | | | | | | Apparently broken files are popular enough that this is still needed. It's relatively often asked on the IRC channel, and I also found it on the archwiki mpv page. The list of aspect ratios is taken from the archwiki page, with "16:10" removed (because I doubt there are actually files with this aspect ratio).
* input.conf: add example for aspect ratio cyclingwm42014-12-081-0/+2
| | | | | This is requested oftem, but I don't know if it should be an actual default binding.
* input.conf: add some additional bindingswm42014-11-191-0/+4
|
* restore-old-bindings.conf: add recently changed bindingwm42014-11-161-0/+4
|
* input.conf: Don't make ENTER exit the playerChrisK22014-11-151-1/+1
| | | | Apparently this is confusing.
* etc/mplayer-input.conf: fix off by one errorwm42014-10-101-1/+1
| | | | | | | | | playlist-pos is 0-based, but everyone thinks it's 1-based. Stupid crap. (The "not the same as MPlayer" refers to a playlist manipulation command that doesn't exist anymore in mpv.) CC: @mpv-player/stable
* etc: add an input config file that reverts recent key binding changeswm42014-10-051-0/+31
| | | | | | | This is for users who don't like changes. I'm hoping it will make the process of cleaning up key bindings less bumpy. It should be mentioned in the release notes of the next release.
* mpv.desktop: add more ogg-related mime typesAlessandro Ghedini2014-09-291-1/+1
| | | | Also adds audio/ogg and video/ogg.
* options: remove --volstepwm42014-09-211-12/+12
| | | | | | | It's just confusing; users are encouraged to edit input.conf instead (changing the argument to the "add" command). Update input.conf to keep the old behavior.
* input.conf: map ESC to exiting fullscreenwm42014-09-151-1/+1
| | | | | | | | | | Apparently making ESC exit fullscreen mode is the more popular convention compared to ESC quitting the program. It was also concluded that ESC should do nothing when the windows is already in normal state. See discussion in #973.
* mplayer-input.conf: fix broken bindingwm42014-09-061-1/+1
| | | | | | | "#" starts a comment, so the # key needs to be handled specially. MPlayer has the same issue, but its input.conf is wrong. Or at least I think it's wrong; looking at the MPlayer code it's doubtful they somehow special-case and handle this.
* command: remove broken quvi-format propertywm42014-09-011-2/+0
| | | | Never really worked, and libquvi is probably a lost cause anyway.
* player: redo how stream caching and pausing on low cache workswm42014-08-271-1/+1
| | | | | | | | | | | | | | | | | | | Add the --cache-secs option, which literally overrides the value of --demuxer-readahead-secs if the stream cache is active. The default value is very high (10 seconds), which means it can act as network cache. Remove the old behavior of trying to pause once the byte cache runs low. Instead, do something similar wit the demuxer cache. The nice thing is that we can guess how many seconds of video it has cached, and we can make better decisions. But for now, apply a relatively naive heuristic: if the cache is below 0.5 secs, pause, and wait until at least 2 secs are available. Note that due to timestamp reordering, the estimated cached duration of video might be inaccurate, depending on the file format. If the file format has DTS, it's easy, otherwise the duration will seemingly jump back and forth.
* input.conf: bind ctrl+cwm42014-08-221-0/+1
| | | | | Just like I can terminate it on the terminal with this key combination, I want to be able to do the same on the X window.
* etc/mpv.desktop: add audio/flac mimetypewm42014-08-211-1/+1
| | | | | | Fixes #1025. CC: @mpv-player/stable
* example.conf: demuxer-thread is now enabled by defaultwm42014-08-191-3/+2
| | | | Provide a more useful example instead.
* input.conf: add some bindings for changing audio-delaywm42014-08-111-0/+2
| | | | | | Requested on: https://github.com/mpv-player/mpv/commit/90ec3334174e80c16f00971886223a3afabc1aca#commitcomment-7331673 Might remove or remap them again later.
* input.conf: make explanatory text more readablewm42014-08-111-30/+15
| | | | | Or at leats this is the intention. It's a bit hard to tell which information is needed, and which not.
* input.conf: change LEFT/RIGHT keys to seek 5s instead of 10swm42014-08-111-2/+2
|
* input.conf: map shift+pgup/dwn to the old seek bindingswm42014-08-091-2/+4
|
* etc/example.conf: update cache optionswm42014-08-091-4/+10
| | | | | | | Some of them changed semantics or got renamed. Note that the replacements in the example.conf are not necessarily the equivalents of the replaced options.
* etc: add mplayer-input.confwm42014-08-091-0/+153
|
* input.conf: switch chapter seek next/previous keyswm42014-08-081-2/+2
| | | | | | "UP" seeks forward, so "PGUP" should skip to the next chapter. Fixes #998.
* input.conf: unmap some more obscure bindingswm42014-08-081-12/+11
| | | | | | | | | | Changing audio-delay is probably not needed. Changing balance "works", but not as expected (sets up a pan matrix to change left/right contributions to each other, rather than changing the relative volumes of each channel). I expect that the rest are not in use by anyone.
* input.conf: remap pgup/dwn to chapter seekswm42014-08-071-4/+8
| | | | | | As discussed in #973. Keep the old bindings for now; there's no reason to unmap them yet.
* build: move def file to libmpv/wm42014-08-051-34/+0
| | | | This is more consistent with mpv.pc, which is also in libmpv/.
* build: list exported symbols explicitlywm42014-08-051-0/+34
| | | | | | | | | | | Instead of using a regex to match names to be exported from the libmpv dynamic shared library, use a libmpv.def file, which lists all exported functions explicitly. This reduces the platform specifics in syms.py. I'm not sure if the separate compile_sym task is still needed (it could probably be collapsed, which would concentrate the platform specifics into one place).
* input.conf: remap 2 keyswm42014-08-031-3/+4
| | | | | | | | | | Nobody uses 'c' (except accidentally) - remove. Everyone agrees that OSD level cycling on 'o' is dumb, so map it to show_progress instead. Cycling the OSD level is now available on 'O'. No reason to ummap 'P' yet. Also see issue #973.
* manpage: update config file locationswm42014-06-282-4/+4
| | | | Also add some explanations how the config paths are determined.
* input: readd some TV default key bindingswm42014-06-251-0/+4
| | | | Requested by a user. Closes #878.
* DOCS: remove en/ sub-directorywm42014-06-201-1/+1
| | | | | This additional sub-directory doesn't serve any purpose anymore. Get rid of it.
* input.conf: make ESC quit when encodingwm42014-06-131-0/+1
|
* command: redo ancient TV/DVB/PVR commandswm42014-06-111-6/+0
| | | | | | | | | | | | | | | | | | Convert all these commands to properties. (Except tv_last_channel, not sure what to do with this.) Also, internally, don't access stream details directly, but dispatch commands with stream ctrls. Many of the new properties are a bit strange, because they're write- only. Also remove some OSD output these commands produced, because I couldn't be bothered to port these. In general, this makes everything much cleaner, and will also make it easier to e.g. move the demuxer to its own thread. Don't bother updating input.conf, but changes.rst documents how old commands map to the new ones. Mostly untested, due to lack of hardware.
* etc/input.conf: add example how to change window size by key bindingwm42014-05-181-0/+1
| | | | Also drop a vague hint how to do it in the manpage.
* etc/example.conf: add example options for multichannel audiowm42014-05-161-1/+9
|
* etc/example.conf: minor adjustmentswm42014-05-161-2/+3
|
* etc/example.conf: remove spaces between key and valuewm42014-05-161-9/+9
| | | | | Currently, they are allowed, but only because MPlayer happened to do that. This might or might not be changed in the future.
* options: rename audio-related options/propertiesMartin Herkt2014-05-041-6/+6
| | | | | | | | | | | | | Renamed options: --audiofile → --audio-file --audiofile-cache → --audio-file-cache --channels → --audio-channels --format → --audio-format --srate → --audio-samplerate Renamed properties: samplerate → audio-samplerate channels → audio-channels
* options: rename subtitle-related optionsMartin Herkt2014-05-041-1/+1
| | | | | | | | | --ass → --sub-ass --autosub → --sub-auto --autosub-match → --sub-auto-match --sub → --sub-file --subcp → --sub-codepage --subfps → --sub-fps
* TOOLS/umpv, mpv.desktop: use --no-terminal instead of --really-quietwm42014-04-291-1/+1
| | | | | So this won't initialize terminal handling if stdout happens to be a terminal. It also suppresses all output to stdout/stderr.
* input: close window when window close button is pressed with --input-testwm42014-04-181-2/+2
| | | | |