diff options
author | wm4 <wm4@nowhere> | 2014-09-07 20:44:54 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-09-07 20:44:54 +0200 |
commit | f5af5962378bd40a409716434a6a4d312e50c755 (patch) | |
tree | 0d507b7254fbd159a6ca0c29f4c0261c4a4becb4 /player/main.c | |
parent | 5546af421f853170ad3142008503bb865a81adef (diff) | |
download | mpv-f5af5962378bd40a409716434a6a4d312e50c755.tar.bz2 mpv-f5af5962378bd40a409716434a6a4d312e50c755.tar.xz |
player: some more input refactoring
Continues commit 348dfd93. Replace other places where input was manually
fetched with common code.
demux_was_interrupted() was a weird function; I'm not entirely sure
about its original purpose, but now we can just replace it with simpler
code as well. One difference is that we always look at the command
queue, rather than just when cache initialization failed. Also, instead
of discarding all but quit/playlist commands (aka abort command), run
all commands. This could possibly lead to unwanted side-effects, like
just ignoring commands that have no effect (consider pressing 'f' for
fullscreen right on start: since the window is not created yet, it would
get discarded). But playlist navigation still works as intended, and
some if not all these problems already existed before that in some
forms, so it should be ok.
Diffstat (limited to 'player/main.c')
-rw-r--r-- | player/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/player/main.c b/player/main.c index 97ccb0e639..6f9a0fcca8 100644 --- a/player/main.c +++ b/player/main.c @@ -111,7 +111,7 @@ static void shutdown_clients(struct MPContext *mpctx) while (mpctx->clients && mp_clients_num(mpctx)) { mp_client_broadcast_event(mpctx, MPV_EVENT_SHUTDOWN, NULL); mp_dispatch_queue_process(mpctx->dispatch, 0); - mp_input_get_cmd(mpctx->input, 100, 1); + mp_wait_events(mpctx, 10000); } mp_clients_destroy(mpctx); } |