summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-08-01 22:57:56 +0200
committerwm4 <wm4@nowhere>2014-08-01 22:57:56 +0200
commitbf5b1e9a0517b357b93ffaef7b6d96ad8b9917b0 (patch)
treec689fb6dc891f72b44eb7895dc57f9c376add0ed /options
parent6aac17cebbcec645a9c07043b78d57a9b04f2578 (diff)
downloadmpv-bf5b1e9a0517b357b93ffaef7b6d96ad8b9917b0.tar.bz2
mpv-bf5b1e9a0517b357b93ffaef7b6d96ad8b9917b0.tar.xz
Remove the last remains of slave mode
Almost nothing was left of it. The only thing this commit actually removes is support for reading input commands from stdin. But you can emulate this via: --input-file=/dev/stdin --input-terminal=no However, this won't work on Windows. Just use a named pipe.
Diffstat (limited to 'options')
-rw-r--r--options/options.c1
-rw-r--r--options/options.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/options/options.c b/options/options.c
index 0d7f426606..ff817bdc1f 100644
--- a/options/options.c
+++ b/options/options.c
@@ -509,7 +509,6 @@ const m_option_t mp_opts[] = {
OPT_STRING("term-status-msg", status_msg, 0),
OPT_STRING("osd-status-msg", osd_status_msg, 0),
- OPT_FLAG("slave-broken", slave_mode, CONF_GLOBAL),
OPT_FLAG("idle", player_idle_mode, M_OPT_GLOBAL),
OPT_FLAG("input-terminal", consolecontrols, CONF_GLOBAL),
diff --git a/options/options.h b/options/options.h
index b7db8b08ce..20b35d6864 100644
--- a/options/options.h
+++ b/options/options.h
@@ -147,7 +147,6 @@ typedef struct MPOpts {
char *heartbeat_cmd;
float heartbeat_interval;
int player_idle_mode;
- int slave_mode;
int consolecontrols;
struct m_rel_time play_start;
struct m_rel_time play_end;