RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
wm4 2015-01-02 03:09:17 +01:00
parent a2d790b3a4
commit f12b70d77d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
player/main.c
View File

@ -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