2008-12-13 18:28:00 +00:00
|
|
|
/*
|
|
|
|
* This file is part of MPlayer.
|
|
|
|
*
|
|
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
2008-02-22 09:09:46 +00:00
|
|
|
#ifndef MPLAYER_INPUT_H
|
|
|
|
#define MPLAYER_INPUT_H
|
2008-01-01 21:35:58 +00:00
|
|
|
|
2012-03-21 00:23:35 +00:00
|
|
|
#include <stdbool.h>
|
2013-08-06 20:41:30 +00:00
|
|
|
#include "mpvcore/bstr.h"
|
|
|
|
#include "mpvcore/m_option.h"
|
2012-03-21 00:23:35 +00:00
|
|
|
|
2003-09-14 17:52:59 +00:00
|
|
|
// All command IDs
|
2011-07-16 15:17:48 +00:00
|
|
|
enum mp_command_type {
|
2012-09-22 13:17:15 +00:00
|
|
|
MP_CMD_IGNORE,
|
2011-07-16 14:47:02 +00:00
|
|
|
MP_CMD_SEEK,
|
|
|
|
MP_CMD_QUIT,
|
core: add playback resume feature (manual/opt-in)
A "watch later" command is now mapped to Shift+Q. This quits the player
and stores the playback state in a config file in ~/.mpv/watch_later/.
When calling the player with the same file again, playback is resumed
at that time position.
It's also possible to make mpv save playback state always on quit with
the --save-position-on-quit option. Likewise, resuming can be disabled
with the --no-resume-playback option.
This also attempts to save some playback parameters, like fullscreen
state or track selection. This will unconditionally override config
settings and command line options (which is probably not what you would
expect, but in general nobody will really care about this). Some things
are not backed up, because that would cause various problems. Additional
subtitle files, video filters, etc. are not stored because that would be
too hard and fragile. Volume/mute state are not stored because it would
mess up if the system mixer is used, or if the system mixer was
readjusted in the meantime.
Basically, the tradeoff between perfect state restoration and
complexity/fragility makes it not worth to attempt to implement
it perfectly, even if the result is a little bit inconsistent.
2013-05-05 17:37:29 +00:00
|
|
|
MP_CMD_QUIT_WATCH_LATER,
|
mplayer: turn playtree into a list, and change per-file option handling
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.
2012-07-31 19:33:26 +00:00
|
|
|
MP_CMD_PLAYLIST_NEXT,
|
|
|
|
MP_CMD_PLAYLIST_PREV,
|
2011-07-16 14:47:02 +00:00
|
|
|
MP_CMD_OSD,
|
|
|
|
MP_CMD_TV_STEP_CHANNEL,
|
|
|
|
MP_CMD_TV_STEP_NORM,
|
|
|
|
MP_CMD_TV_STEP_CHANNEL_LIST,
|
|
|
|
MP_CMD_SCREENSHOT,
|
2013-07-08 18:34:26 +00:00
|
|
|
MP_CMD_SCREENSHOT_TO_FILE,
|
2011-07-16 14:47:02 +00:00
|
|
|
MP_CMD_LOADFILE,
|
|
|
|
MP_CMD_LOADLIST,
|
mplayer: turn playtree into a list, and change per-file option handling
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.
2012-07-31 19:33:26 +00:00
|
|
|
MP_CMD_PLAYLIST_CLEAR,
|
2013-07-02 11:17:50 +00:00
|
|
|
MP_CMD_PLAYLIST_REMOVE,
|
|
|
|
MP_CMD_PLAYLIST_MOVE,
|
2011-07-16 14:47:02 +00:00
|
|
|
MP_CMD_SUB_STEP,
|
|
|
|
MP_CMD_TV_SET_CHANNEL,
|
|
|
|
MP_CMD_TV_LAST_CHANNEL,
|
|
|
|
MP_CMD_TV_SET_FREQ,
|
|
|
|
MP_CMD_TV_SET_NORM,
|
|
|
|
MP_CMD_FRAME_STEP,
|
core: add backstep support
Allows stepping back one frame via the frame_back_step inout command,
bound to "," by default.
This uses the precise seeking facility, and a perfect frame index built
on the fly. The index is built during playback and precise seeking, and
contains (as of this commit) the last 100 displayed or skipped frames.
This index is used to find the PTS of the previous frame, which is then
used as target for a precise seek. If no PTS is found, the core attempts
to do a seek before the current frame, and skip decoded frames until the
current frame is reached; this will create a sufficient index and the
normal backstep algorithm can be applied.
This can be rather slow. The worst case for backstepping is about the
same as the worst case for precise seeking if the previous frame can be
deduced from the index. If not, the worst case will be twice as slow.
There's also some minor danger that the index is incorrect in case
framedropping is involved. For framedropping due to --framedrop, this
problem is ignored (use of --framedrop is discouraged anyway). For
framedropping during precise seeking (done to make it faster), we try
to not add frames to the index that are produced when this can happen.
I'm not sure how well that works (or if the logic is sane), and it's
sure to break with some video filters. In the worst case, backstepping
might silently skip frames if you backstep after a user-initiated
precise seek. (Precise seeks to do indexing are not affected.)
Likewise, video filters that somehow change timing of frames and do not
do this in a deterministic way (i.e. if you seek to a position, frames
with different timings are produced than when the position is reached
during normal playback) will make backstepping silently jump to the
wrong frame. Enabling/disabling filters during playback (like for
example deinterlacing) will have similar bad effects.
2013-04-24 17:31:48 +00:00
|
|
|
MP_CMD_FRAME_BACK_STEP,
|
2011-07-16 14:47:02 +00:00
|
|
|
MP_CMD_SPEED_MULT,
|
|
|
|
MP_CMD_RUN,
|
2012-11-15 19:26:52 +00:00
|
|
|
MP_CMD_SUB_ADD,
|
|
|
|
MP_CMD_SUB_REMOVE,
|
|
|
|
MP_CMD_SUB_RELOAD,
|
2011-07-16 14:47:02 +00:00
|
|
|
MP_CMD_KEYDOWN_EVENTS,
|
2012-09-09 00:08:08 +00:00
|
|
|
MP_CMD_SET,
|
2011-07-16 14:47:02 +00:00
|
|
|
MP_CMD_GET_PROPERTY,
|
2012-10-11 00:24:13 +00:00
|
|
|
MP_CMD_PRINT_TEXT,
|
2012-09-15 00:04:57 +00:00
|
|
|
MP_CMD_SHOW_TEXT,
|
|
|
|
MP_CMD_SHOW_PROGRESS,
|
2011-07-16 14:47:02 +00:00
|
|
|
MP_CMD_RADIO_STEP_CHANNEL,
|
|
|
|
MP_CMD_RADIO_SET_CHANNEL,
|
|
|
|
MP_CMD_RADIO_SET_FREQ,
|
2012-09-22 04:15:36 +00:00
|
|
|
MP_CMD_ADD,
|
|
|
|
MP_CMD_CYCLE,
|
2011-07-16 14:47:02 +00:00
|
|
|
MP_CMD_RADIO_STEP_FREQ,
|
|
|
|
MP_CMD_TV_STEP_FREQ,
|
|
|
|
MP_CMD_TV_START_SCAN,
|
|
|
|
MP_CMD_STOP,
|
|
|
|
|
2013-06-22 23:28:28 +00:00
|
|
|
MP_CMD_ENABLE_INPUT_SECTION,
|
|
|
|
MP_CMD_DISABLE_INPUT_SECTION,
|
|
|
|
|
2011-07-16 14:47:02 +00:00
|
|
|
/// DVB commands
|
|
|
|
MP_CMD_DVB_SET_CHANNEL = 5101,
|
|
|
|
|
|
|
|
/// Audio Filter commands
|
2013-07-22 12:43:58 +00:00
|
|
|
MP_CMD_AF,
|
2011-10-23 03:26:30 +00:00
|
|
|
|
2013-05-18 09:44:17 +00:00
|
|
|
/// Video filter commands
|
|
|
|
MP_CMD_VF,
|
|
|
|
|
2012-07-31 23:06:59 +00:00
|
|
|
/// Video output commands
|
|
|
|
MP_CMD_VO_CMDLINE,
|
2013-07-08 17:27:45 +00:00
|
|
|
|
|
|
|
// Internal
|
|
|
|
MP_CMD_COMMAND_LIST, // list of sub-commands in args[0].v.p
|
2011-07-16 15:17:48 +00:00
|
|
|
};
|
2002-11-14 23:41:44 +00:00
|
|
|
|
2002-01-30 12:46:03 +00:00
|
|
|
#define MP_CMD_MAX_ARGS 10
|
2002-03-19 13:29:28 +00:00
|
|
|
|
|
|
|
// Error codes for the drivers
|
2002-01-30 12:46:03 +00:00
|
|
|
|
2003-12-24 22:00:51 +00:00
|
|
|
// An error occurred but we can continue
|
2002-01-30 12:46:03 +00:00
|
|
|
#define MP_INPUT_ERROR -1
|
2003-12-24 22:00:51 +00:00
|
|
|
// A fatal error occurred, this driver should be removed
|
2002-01-30 12:46:03 +00:00
|
|
|
#define MP_INPUT_DEAD -2
|
2003-09-14 17:52:59 +00:00
|
|
|
// No input was available
|
2002-01-30 12:46:03 +00:00
|
|
|
#define MP_INPUT_NOTHING -3
|
2005-06-27 08:16:23 +00:00
|
|
|
//! Input will be available if you try again
|
|
|
|
#define MP_INPUT_RETRY -4
|
2011-05-01 12:57:39 +00:00
|
|
|
// Key FIFO was full - release events may be lost, zero button-down status
|
|
|
|
#define MP_INPUT_RELEASE_ALL -5
|
|
|
|
|
2012-09-09 00:08:08 +00:00
|
|
|
enum mp_on_osd {
|
2012-09-25 01:24:38 +00:00
|
|
|
MP_ON_OSD_NO = 0, // prefer not using OSD
|
|
|
|
MP_ON_OSD_AUTO = 1, // use default behavior of the specific command
|
|
|
|
MP_ON_OSD_BAR = 2, // force a bar, if applicable
|
|
|
|
MP_ON_OSD_MSG = 4, // force a message, if applicable
|
2012-09-09 00:08:08 +00:00
|
|
|
};
|
|
|
|
|
2012-08-24 11:29:28 +00:00
|
|
|
enum mp_input_section_flags {
|
input: handle mouse movement differently
Before this commit, mouse movement events emitted a special command
("set_mouse_pos"), which was specially handled in command.c. This was
once special-cased to the dvdnav and menu code, and did nothing after
libmenu and dvdnav were removed.
Change it so that mouse movement triggers a pseudo-key ("MOUSE_MOVE"),
which then can be bound to an arbitrary command. The mouse position is
now managed in input.c. A command which actually needs the mouse
position can use either mp_input_get_mouse_pos() or mp_get_osd_mouse_pos()
to query it. The former returns raw window-space coordinates, while the
latter returns coordinates transformed to OSD- space. (Both are the same
for most VOs, except vo_xv and vo_x11, which can't render OSD in
window-space. These require extra code for mapping mouse position.)
As of this commit, there is still nothing that uses mouse movement, so
MOUSE_MOVE is mapped to "ignore" to silence warnings when moving the
mouse (much like MOUSE_BTN0).
Extend the concept of input sections. Allow multiple sections to be
active at once, and organize them as stack. Bindings from the top of
the stack are preferred to lower ones.
Each section has a mouse input section associated, inside which mouse
events are associated with the bindings. If the mouse pointer is
outside of a section's mouse area, mouse events will be dispatched to
an input section lower on the stack of active sections. This is intended
for scripting, which is to be added later. Two scripts could occupy
different areas of the screen without conflicting with each other. (If
it turns out that this mechanism is useless, we'll just remove it
again.)
2013-04-26 00:13:30 +00:00
|
|
|
// If a key binding is not defined in the current section, do not search the
|
|
|
|
// other sections for it (like the default section). Instead, an unbound
|
|
|
|
// key warning will be printed.
|
|
|
|
MP_INPUT_EXCLUSIVE = 1,
|
2013-08-31 19:59:37 +00:00
|
|
|
// Let mp_input_test_dragging() return true, even if inside the mouse area.
|
|
|
|
MP_INPUT_ALLOW_VO_DRAGGING = 2,
|
input: don't deliver mouse events if mouse area is not set
This caused the OSC to be always visible at startup on X11:
- EnterNotify event send a mouse event to input.c
- OSC has not completely initialized yet, and no mouse area is set
- mouse event is dispatched to "showhide" OSC section
- OSC becomes visible, regardless of mouse position
Fix this by treating the mouse area as empty if it's not set, instead of
infinite as it was before this commit. This means an input section must
set a mouse area to receive mouse events at all. We also have to change
the default section to receive mouse events with the new behavior.
Also, if MOUSE_MOVE is unmapped (or mapped to something that doesn't
parse), and produces no command, the mouse position wouldn't be updated
(because the mouse position is bound to input commands), so we have to
generate a dummy command in this case.
(This matters only for the OSC, On Screen Controller, which isn't merged
yet, so these changes shouldn't have much effect right now.)
2013-09-05 21:58:51 +00:00
|
|
|
// Don't force mouse pointer visible, even if inside the mouse area.
|
|
|
|
MP_INPUT_ALLOW_HIDE_CURSOR = 4,
|
2012-08-24 11:29:28 +00:00
|
|
|
};
|
2002-01-30 12:46:03 +00:00
|
|
|
|
2008-04-30 04:15:52 +00:00
|
|
|
struct input_ctx;
|
|
|
|
|
2011-07-16 15:17:48 +00:00
|
|
|
struct mp_cmd_arg {
|
commands: add choice type to input commands
Allow using the choice type (as it used for command line) for arguments
of input commands. Change the magic integer arguments of some commands
(like seek) to use choices instead. The old numeric values are still
allowed (but only those which made sense before, not arbitrary
integers).
In order to do this, remove the input.c specific types (like
MP_CMD_ARG_INT) completely and specify commands using the m_option
types.
Also, add the special choice "-" to some arguments. It's supposed to
signify the default value, so arguments can be easily skipped. Maybe the
choice option should recognize this and not change the previous value,
but we'll leave this for later.
For now, leave compatibility integer values for all new choice
arguments, e.g. "0" maps to 0. We could let the choice option type do
this automatically, but we don't, because we want user input values and
internal mplayer values decoupled in general. The compatibility options
will be removed one day, too.
Also, remove optional args for strings - would require either annoying
additional code, or copying strings twice. It's not used, so remove it.
2012-09-24 19:57:43 +00:00
|
|
|
struct m_option type;
|
2012-03-21 00:23:35 +00:00
|
|
|
bool optional;
|
2011-07-16 15:17:48 +00:00
|
|
|
union {
|
|
|
|
int i;
|
|
|
|
float f;
|
2013-02-24 20:16:23 +00:00
|
|
|
double d;
|
2011-07-16 15:17:48 +00:00
|
|
|
char *s;
|
2013-07-08 17:27:45 +00:00
|
|
|
void *p;
|
2011-07-16 15:17:48 +00:00
|
|
|
} v;
|
|
|
|
};
|
2002-01-30 12:46:03 +00:00
|
|
|
|
|
|
|
typedef struct mp_cmd {
|
2011-07-16 14:47:02 +00:00
|
|
|
int id;
|
|
|
|
char *name;
|
2011-07-16 15:17:48 +00:00
|
|
|
struct mp_cmd_arg args[MP_CMD_MAX_ARGS];
|
2012-03-21 00:23:35 +00:00
|
|
|
int nargs;
|
2011-07-16 14:47:02 +00:00
|
|
|
int pausing;
|
2013-05-18 10:56:22 +00:00
|
|
|
bool raw_args;
|
2012-09-09 00:08:08 +00:00
|
|
|
enum mp_on_osd on_osd;
|
2012-10-13 19:10:20 +00:00
|
|
|
bstr original;
|
2013-06-19 16:19:45 +00:00
|
|
|
char *input_section;
|
input: handle mouse movement differently
Before this commit, mouse movement events emitted a special command
("set_mouse_pos"), which was specially handled in command.c. This was
once special-cased to the dvdnav and menu code, and did nothing after
libmenu and dvdnav were removed.
Change it so that mouse movement triggers a pseudo-key ("MOUSE_MOVE"),
which then can be bound to an arbitrary command. The mouse position is
now managed in input.c. A command which actually needs the mouse
position can use either mp_input_get_mouse_pos() or mp_get_osd_mouse_pos()
to query it. The former returns raw window-space coordinates, while the
latter returns coordinates transformed to OSD- space. (Both are the same
for most VOs, except vo_xv and vo_x11, which can't render OSD in
window-space. These require extra code for mapping mouse position.)
As of this commit, there is still nothing that uses mouse movement, so
MOUSE_MOVE is mapped to "ignore" to silence warnings when moving the
mouse (much like MOUSE_BTN0).
Extend the concept of input sections. Allow multiple sections to be
active at once, and organize them as stack. Bindings from the top of
the stack are preferred to lower ones.
Each section has a mouse input section associated, inside which mouse
events are associated with the bindings. If the mouse pointer is
outside of a section's mouse area, mouse events will be dispatched to
an input section lower on the stack of active sections. This is intended
for scripting, which is to be added later. Two scripts could occupy
different areas of the screen without conflicting with each other. (If
it turns out that this mechanism is useless, we'll just remove it
again.)
2013-04-26 00:13:30 +00:00
|
|
|
bool key_up_follows;
|
|
|
|
bool mouse_move;
|
|
|
|
int mouse_x, mouse_y;
|
2011-07-17 01:47:50 +00:00
|
|
|
struct mp_cmd *queue_next;
|
2013-07-25 16:08:57 +00:00
|
|
|
double scale; // for scaling numeric arguments
|
2002-01-30 12:46:03 +00:00
|
|
|
} mp_cmd_t;
|
|
|
|
|
|
|
|
|
mplayer: turn playtree into a list, and change per-file option handling
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.
2012-07-31 19:33:26 +00:00
|
|
|
// Executing this command will abort playback (play something else, or quit).
|
|
|
|
bool mp_input_is_abort_cmd(int cmd_id);
|
|
|
|
|
2011-07-16 14:47:02 +00:00
|
|
|
/* Add a new command input source.
|
|
|
|
* "fd" is a file descriptor (use a negative value if you don't use any fd)
|
|
|
|
* "select" tells whether to use select() on the fd to determine when to
|
|
|
|
* try reading.
|
|
|
|
* "read_func" is optional. If NULL a default function which reads data
|
2011-07-16 15:17:48 +00:00
|
|
|
* directly from the fd will be used. It must return either text data
|
|
|
|
* or one of the MP_INPUT error codes above.
|
|
|
|
* "close_func" will be called when closing. Can be NULL. Its return value
|
|
|
|
* is ignored (it's only there to allow using standard close() as the func).
|
2011-07-16 14:47:02 +00:00
|
|
|
*/
|
2008-04-30 10:14:03 +00:00
|
|
|
int mp_input_add_cmd_fd(struct input_ctx *ictx, int fd, int select,
|
2011-07-16 15:17:48 +00:00
|
|
|
int read_func(int fd, char *dest, int size),
|
|
|
|
int close_func(int fd));
|
2002-01-30 12:46:03 +00:00
|
|
|
|
2011-07-16 14:47:02 +00:00
|
|
|
/* The args are similar to the cmd version above, except you must give
|
2011-07-16 15:17:48 +00:00
|
|
|
* a read_func, and it should return key codes (ASCII plus keycodes.h).
|
2011-07-16 14:47:02 +00:00
|
|
|
*/
|
2008-04-30 08:06:55 +00:00
|
|
|
int mp_input_add_key_fd(struct input_ctx *ictx, int fd, int select,
|
2011-07-16 15:17:48 +00:00
|
|
|
int read_func(void *ctx, int fd),
|
|
|
|
int close_func(int fd), void *ctx);
|
2002-01-30 12:46:03 +00:00
|
|
|
|
2013-07-02 12:00:24 +00:00
|
|
|
// Process keyboard input. code is a key code from keycodes.h, possibly
|
|
|
|
// with modifiers applied. MP_INPUT_RELEASE_ALL is also a valid value.
|
|
|
|
void mp_input_put_key(struct input_ctx *ictx, int code);
|
|
|
|
|
|
|
|
// Like mp_input_put_key(), but process all UTF-8 characters in the given
|
|
|
|
// string as key events.
|
|
|
|
void mp_input_put_key_utf8(struct input_ctx *ictx, int mods, struct bstr t);
|
2011-07-17 01:47:50 +00:00
|
|
|
|
2013-07-25 16:08:57 +00:00
|
|
|
// Process scrolling input. Support for precise scrolling. Scales the given
|
|
|
|
// scroll amount add multiplies it with the command (seeking, sub-delay, etc)
|
|
|
|
void mp_input_put_axis(struct input_ctx *ictx, int direction, double value);
|
|
|
|
|
input: handle mouse movement differently
Before this commit, mouse movement events emitted a special command
("set_mouse_pos"), which was specially handled in command.c. This was
once special-cased to the dvdnav and menu code, and did nothing after
libmenu and dvdnav were removed.
Change it so that mouse movement triggers a pseudo-key ("MOUSE_MOVE"),
which then can be bound to an arbitrary command. The mouse position is
now managed in input.c. A command which actually needs the mouse
position can use either mp_input_get_mouse_pos() or mp_get_osd_mouse_pos()
to query it. The former returns raw window-space coordinates, while the
latter returns coordinates transformed to OSD- space. (Both are the same
for most VOs, except vo_xv and vo_x11, which can't render OSD in
window-space. These require extra code for mapping mouse position.)
As of this commit, there is still nothing that uses mouse movement, so
MOUSE_MOVE is mapped to "ignore" to silence warnings when moving the
mouse (much like MOUSE_BTN0).
Extend the concept of input sections. Allow multiple sections to be
active at once, and organize them as stack. Bindings from the top of
the stack are preferred to lower ones.
Each section has a mouse input section associated, inside which mouse
events are associated with the bindings. If the mouse pointer is
outside of a section's mouse area, mouse events will be dispatched to
an input section lower on the stack of active sections. This is intended
for scripting, which is to be added later. Two scripts could occupy
different areas of the screen without conflicting with each other. (If
it turns out that this mechanism is useless, we'll just remove it
again.)
2013-04-26 00:13:30 +00:00
|
|
|
// Update mouse position (in window coordinates).
|
|
|
|
void mp_input_set_mouse_pos(struct input_ctx *ictx, int x, int y);
|
|
|
|
|
|
|
|
void mp_input_get_mouse_pos(struct input_ctx *ictx, int *x, int *y);
|
|
|
|
|
2003-09-14 17:52:59 +00:00
|
|
|
// As for the cmd one you usually don't need this function.
|
2008-04-30 08:06:55 +00:00
|
|
|
void mp_input_rm_key_fd(struct input_ctx *ictx, int fd);
|
2002-01-30 12:46:03 +00:00
|
|
|
|
2011-07-16 14:47:02 +00:00
|
|
|
// Get input key from its name.
|
2007-12-04 10:42:59 +00:00
|
|
|
int mp_input_get_key_from_name(const char *name);
|
|
|
|
|
2011-07-16 14:47:02 +00:00
|
|
|
// Add a command to the command queue.
|
|
|
|
int mp_input_queue_cmd(struct input_ctx *ictx, struct mp_cmd *cmd);
|
2002-02-23 21:13:35 +00:00
|
|
|
|
2011-07-16 14:47:02 +00:00
|
|
|
/* Return next available command, or sleep up to "time" ms if none is
|
|
|
|
* available. If "peek_only" is true return a reference to the command
|
|
|
|
* but leave it queued.
|
|
|
|
*/
|
|
|
|
struct mp_cmd *mp_input_get_cmd(struct input_ctx *ictx, int time,
|
|
|
|
int peek_only);
|
2002-01-30 12:46:03 +00:00
|
|
|
|
2012-10-13 19:09:42 +00:00
|
|
|
// Parse text and return corresponding struct mp_cmd.
|
|
|
|
// The location parameter is for error messages.
|
|
|
|
struct mp_cmd *mp_input_parse_cmd(bstr str, const char *location);
|
2002-11-14 23:41:44 +00:00
|
|
|
|
2002-03-19 13:29:28 +00:00
|
|
|
// After getting a command from mp_input_get_cmd you need to free it using this
|
|
|
|
// function
|
2011-07-16 14:47:02 +00:00
|
|
|
void mp_cmd_free(struct mp_cmd *cmd);
|
2002-01-30 12:46:03 +00:00
|
|
|
|
2003-09-14 17:52:59 +00:00
|
|
|
// This creates a copy of a command (used by the auto repeat stuff).
|
2011-07-16 14:47:02 +00:00
|
|
|
struct mp_cmd *mp_cmd_clone(struct mp_cmd *cmd);
|
2002-02-11 11:42:08 +00:00
|
|
|
|
input: handle mouse movement differently
Before this commit, mouse movement events emitted a special command
("set_mouse_pos"), which was specially handled in command.c. This was
once special-cased to the dvdnav and menu code, and did nothing after
libmenu and dvdnav were removed.
Change it so that mouse movement triggers a pseudo-key ("MOUSE_MOVE"),
which then can be bound to an arbitrary command. The mouse position is
now managed in input.c. A command which actually needs the mouse
position can use either mp_input_get_mouse_pos() or mp_get_osd_mouse_pos()
to query it. The former returns raw window-space coordinates, while the
latter returns coordinates transformed to OSD- space. (Both are the same
for most VOs, except vo_xv and vo_x11, which can't render OSD in
window-space. These require extra code for mapping mouse position.)
As of this commit, there is still nothing that uses mouse movement, so
MOUSE_MOVE is mapped to "ignore" to silence warnings when moving the
mouse (much like MOUSE_BTN0).
Extend the concept of input sections. Allow multiple sections to be
active at once, and organize them as stack. Bindings from the top of
the stack are preferred to lower ones.
Each section has a mouse input section associated, inside which mouse
events are associated with the bindings. If the mouse pointer is
outside of a section's mouse area, mouse events will be dispatched to
an input section lower on the stack of active sections. This is intended
for scripting, which is to be added later. Two scripts could occupy
different areas of the screen without conflicting with each other. (If
it turns out that this mechanism is useless, we'll just remove it
again.)
2013-04-26 00:13:30 +00:00
|
|
|
// Set current input section. The section is appended on top of the list of
|
|
|
|
// active sections, so its bindings are considered first. If the section was
|
|
|
|
// already active, it's moved to the top as well.
|
|
|
|
// name==NULL will behave as if name=="default"
|
2012-08-24 11:29:28 +00:00
|
|
|
// flags is a bitfield of enum mp_input_section_flags values
|
input: handle mouse movement differently
Before this commit, mouse movement events emitted a special command
("set_mouse_pos"), which was specially handled in command.c. This was
once special-cased to the dvdnav and menu code, and did nothing after
libmenu and dvdnav were removed.
Change it so that mouse movement triggers a pseudo-key ("MOUSE_MOVE"),
which then can be bound to an arbitrary command. The mouse position is
now managed in input.c. A command which actually needs the mouse
position can use either mp_input_get_mouse_pos() or mp_get_osd_mouse_pos()
to query it. The former returns raw window-space coordinates, while the
latter returns coordinates transformed to OSD- space. (Both are the same
for most VOs, except vo_xv and vo_x11, which can't render OSD in
window-space. These require extra code for mapping mouse position.)
As of this commit, there is still nothing that uses mouse movement, so
MOUSE_MOVE is mapped to "ignore" to silence warnings when moving the
mouse (much like MOUSE_BTN0).
Extend the concept of input sections. Allow multiple sections to be
active at once, and organize them as stack. Bindings from the top of
the stack are preferred to lower ones.
Each section has a mouse input section associated, inside which mouse
events are associated with the bindings. If the mouse pointer is
outside of a section's mouse area, mouse events will be dispatched to
an input section lower on the stack of active sections. This is intended
for scripting, which is to be added later. Two scripts could occupy
different areas of the screen without conflicting with each other. (If
it turns out that this mechanism is useless, we'll just remove it
again.)
2013-04-26 00:13:30 +00:00
|
|
|
void mp_input_enable_section(struct input_ctx *ictx, char *name, int flags);
|
|
|
|
|
|
|
|
// Undo mp_input_enable_section().
|
|
|
|
// name==NULL will behave as if name=="default"
|
|
|
|
void mp_input_disable_section(struct input_ctx *ictx, char *name);
|
|
|
|
|
|
|
|
// Like mp_input_set_section(ictx, ..., 0) for all sections.
|
|
|
|
void mp_input_disable_all_sections(struct input_ctx *ictx);
|
|
|
|
|
|
|
|
// Set the contents of an input section.
|
|
|
|
// name: name of the section, for mp_input_set_section() etc.
|
|
|
|
// location: location string (like filename) for error reporting
|
|
|
|
// contents: list of keybindings, like input.conf
|
|
|
|
// a value of NULL deletes the section
|
|
|
|
// builtin: create as builtin section; this means if the user defines bindings
|
|
|
|
// using "{name}", they won't be ignored or overwritten - instead,
|
|
|
|
// they are preferred to the bindings defined with this call
|
|
|
|
// If the section already exists, its bindings are removed and replaced.
|
|
|
|
void mp_input_define_section(struct input_ctx *ictx, char *name, char *location,
|
|
|
|
char *contents, bool builtin);
|
|
|
|
|
|
|
|
// Define where on the screen the named input section should receive.
|
|
|
|
// Setting a rectangle of size 0 unsets the mouse area.
|
|
|
|
// A rectangle with negative size disables mouse input for this section.
|
|
|
|
void mp_input_set_section_mouse_area(struct input_ctx *ictx, char *name,
|
|
|
|
int x0, int y0, int x1, int y1);
|
2007-06-07 18:06:53 +00:00
|
|
|
|
2013-05-16 21:17:46 +00:00
|
|
|
// Used to detect mouse movement.
|
2013-05-25 16:31:06 +00:00
|
|
|
unsigned int mp_input_get_mouse_event_counter(struct input_ctx *ictx);
|
2013-05-16 21:17:46 +00:00
|
|
|
|
input: handle mouse movement differently
Before this commit, mouse movement events emitted a special command
("set_mouse_pos"), which was specially handled in command.c. This was
once special-cased to the dvdnav and menu code, and did nothing after
libmenu and dvdnav were removed.
Change it so that mouse movement triggers a pseudo-key ("MOUSE_MOVE"),
which then can be bound to an arbitrary command. The mouse position is
now managed in input.c. A command which actually needs the mouse
position can use either mp_input_get_mouse_pos() or mp_get_osd_mouse_pos()
to query it. The former returns raw window-space coordinates, while the
latter returns coordinates transformed to OSD- space. (Both are the same
for most VOs, except vo_xv and vo_x11, which can't render OSD in
window-space. These require extra code for mapping mouse position.)
As of this commit, there is still nothing that uses mouse movement, so
MOUSE_MOVE is mapped to "ignore" to silence warnings when moving the
mouse (much like MOUSE_BTN0).
Extend the concept of input sections. Allow multiple sections to be
active at once, and organize them as stack. Bindings from the top of
the stack are preferred to lower ones.
Each section has a mouse input section associated, inside which mouse
events are associated with the bindings. If the mouse pointer is
outside of a section's mouse area, mouse events will be dispatched to
an input section lower on the stack of active sections. This is intended
for scripting, which is to be added later. Two scripts could occupy
different areas of the screen without conflicting with each other. (If
it turns out that this mechanism is useless, we'll just remove it
again.)
2013-04-26 00:13:30 +00:00
|
|
|
// Test whether there is any input section which wants to receive events.
|
|
|
|
// Note that the mouse event is always delivered, even if this returns false.
|
|
|
|
bool mp_input_test_mouse_active(struct input_ctx *ictx, int x, int y);
|
|
|
|
|
|
|
|
// Whether input.c wants mouse drag events at this mouse position. If this
|
|
|
|
// returns false, some VOs will initiate window dragging.
|
|
|
|
bool mp_input_test_dragging(struct input_ctx *ictx, int x, int y);
|
|
|
|
|
2011-07-16 14:47:02 +00:00
|
|
|
// Initialize the input system
|
2013-09-10 06:29:45 +00:00
|
|
|
struct mpv_global;
|
|
|
|
struct input_ctx *mp_input_init(struct mpv_global *global);
|
2002-01-30 12:46:03 +00:00
|
|
|
|
2013-07-27 19:26:00 +00:00
|
|
|
void mp_input_uninit(struct input_ctx *ictx);
|
2008-08-12 11:22:26 +00:00
|
|
|
|
2012-03-25 19:58:48 +00:00
|
|
|
// Wake up sleeping input loop from another thread.
|
|
|
|
void mp_input_wakeup(struct input_ctx *ictx);
|
|
|
|
|
2012-11-09 00:06:43 +00:00
|
|
|
// Interruptible usleep: (used by demux)
|
2011-07-16 14:47:02 +00:00
|
|
|
int mp_input_check_interrupt(struct input_ctx *ictx, int time);
|
2002-10-23 14:46:20 +00:00
|
|
|
|
2008-01-08 21:40:44 +00:00
|
|
|
extern int async_quit_request;
|
|
|
|
|
2008-02-22 09:09:46 +00:00
|
|
|
#endif /* MPLAYER_INPUT_H */
|