summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-11 15:41:18 +0200
committerwm4 <wm4@nowhere>2014-05-11 15:41:34 +0200
commit31663beeac3643efa4d4f179956afdfb8eea676f (patch)
tree2c2cb31da09347c56549822b04a2cf9f291edeb2
parent4b367d1602f206574886ee135dfe4238b7a08ed8 (diff)
downloadmpv-31663beeac3643efa4d4f179956afdfb8eea676f.tar.bz2
mpv-31663beeac3643efa4d4f179956afdfb8eea676f.tar.xz
input: remove pausing command prefixes
These are now equivalent to combining commands with the "cycle pause" or "set pause" commands, and thus are not needed anymore. They were also obscure and undocumented.
-rw-r--r--DOCS/man/en/input.rst3
-rw-r--r--input/cmd_parse.c2
-rw-r--r--input/input.h3
-rw-r--r--player/command.c9
4 files changed, 0 insertions, 17 deletions
diff --git a/DOCS/man/en/input.rst b/DOCS/man/en/input.rst
index 3843a0b1b8..50784db939 100644
--- a/DOCS/man/en/input.rst
+++ b/DOCS/man/en/input.rst
@@ -510,9 +510,6 @@ prefixes can be specified. They are separated by whitespace.
All of the osd prefixes are still overridden by the global ``--osd-level``
settings.
-Undocumented prefixes: ``pausing``, ``pausing_keep``, ``pausing_toggle``,
-``pausing_keep_force``. (Should these be made official?)
-
Input Sections
--------------
diff --git a/input/cmd_parse.c b/input/cmd_parse.c
index 64b23ac05f..fd7e178e73 100644
--- a/input/cmd_parse.c
+++ b/input/cmd_parse.c
@@ -108,8 +108,6 @@ struct flag {
};
static const struct flag cmd_flags[] = {
- {"pausing", MP_PAUSING_FLAGS, MP_PAUSING},
- {"pausing-toggle", MP_PAUSING_FLAGS, MP_PAUSING_TOGGLE},
{"no-osd", MP_ON_OSD_FLAGS, MP_ON_OSD_NO},
{"osd-bar", MP_ON_OSD_FLAGS, MP_ON_OSD_BAR},
{"osd-msg", MP_ON_OSD_FLAGS, MP_ON_OSD_MSG},
diff --git a/input/input.h b/input/input.h
index b774462aab..2dc7b4b366 100644
--- a/input/input.h
+++ b/input/input.h
@@ -44,12 +44,9 @@ enum mp_cmd_flags {
MP_ON_OSD_BAR = 2, // force a bar, if applicable
MP_ON_OSD_MSG = 4, // force a message, if applicable
MP_EXPAND_PROPERTIES = 8, // expand strings as properties
- MP_PAUSING = 16, // pause after running command
- MP_PAUSING_TOGGLE = 32, // toggle pause after running command
MP_ON_OSD_FLAGS = MP_ON_OSD_NO | MP_ON_OSD_AUTO |
MP_ON_OSD_BAR | MP_ON_OSD_MSG,
- MP_PAUSING_FLAGS = MP_PAUSING | MP_PAUSING_TOGGLE,
};
enum mp_input_section_flags {
diff --git a/player/command.c b/player/command.c
index 08f97f4b2e..ec05e8cc40 100644
--- a/player/command.c
+++ b/player/command.c
@@ -3714,15 +3714,6 @@ void run_command(MPContext *mpctx, mp_cmd_t *cmd)
default:
MP_VERBOSE(mpctx, "Received unknown cmd %s\n", cmd->name);
}
-
- if (cmd->flags & MP_PAUSING)
- pause_player(mpctx);
- if (cmd->flags & MP_PAUSING_TOGGLE) {
- if (opts->pause)
- unpause_player(mpctx);
- else
- pause_player(mpctx);
- }
}
void command_uninit(struct MPContext *mpctx)