summaryrefslogtreecommitdiffstats
path: root/player
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 /player
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 'player')
-rw-r--r--player/main.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/player/main.c b/player/main.c
index aebfa06fb1..13ecff9f9e 100644
--- a/player/main.c
+++ b/player/main.c
@@ -402,15 +402,8 @@ int mp_initialize(struct MPContext *mpctx)
}
#endif
- if (opts->use_terminal) {
- if (mpctx->opts->slave_mode)
- terminal_setup_stdin_cmd_input(mpctx->input);
- else if (mpctx->opts->consolecontrols)
- terminal_setup_getch(mpctx->input);
-
- if (opts->consolecontrols)
- getch2_enable();
- }
+ if (opts->use_terminal && opts->consolecontrols)
+ terminal_setup_getch(mpctx->input);
#if HAVE_LIBASS
mpctx->ass_log = mp_log_new(mpctx, mpctx->global->log, "!libass");