diff options
author | wm4 <wm4@nowhere> | 2015-01-02 03:09:17 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-01-02 03:09:17 +0100 |
commit | f12b70d77d42211f06a71eaa61c0e650f06fb501 (patch) | |
tree | c988d9a6c475a65761b08ab60da5330d5cda32cc | |
parent | a2d790b3a464837e3387cd60c056cfde59855015 (diff) | |
download | mpv-f12b70d77d42211f06a71eaa61c0e650f06fb501.tar.bz2 mpv-f12b70d77d42211f06a71eaa61c0e650f06fb501.tar.xz |
player: move terminal input init to a better place
Mostly of cosmetic nature. Move initialization to the same place where
another component (cocoa) will start accessing the input context from a
foreign thread.
-rw-r--r-- | player/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/player/main.c b/player/main.c index 37b1bbdf28..732be8c1da 100644 --- a/player/main.c +++ b/player/main.c @@ -440,9 +440,6 @@ int mp_initialize(struct MPContext *mpctx) } #endif - if (opts->consolecontrols && cas_terminal_owner(mpctx, mpctx)) - terminal_setup_getch(mpctx->input); - #if !HAVE_LIBASS MP_WARN(mpctx, "Compiled without libass.\n"); MP_WARN(mpctx, "There will be no OSD and no text subtitles.\n"); @@ -455,6 +452,9 @@ int mp_initialize(struct MPContext *mpctx) mp_get_resume_defaults(mpctx); + if (opts->consolecontrols && cas_terminal_owner(mpctx, mpctx)) + terminal_setup_getch(mpctx->input); + #if HAVE_COCOA cocoa_set_input_context(mpctx->input); #endif |