summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-05-24 14:02:56 +0200
committerwm4 <wm4@nowhere>2014-05-24 16:17:50 +0200
commit3316cf5f9b213dc047aa0515fbc51f12fb27cc58 (patch)
tree31c35951e47f9743fab55d8830fabdd67223760b
parent6ca8a67f9675fdf350753d703202f5b8cbedc23d (diff)
downloadmpv-3316cf5f9b213dc047aa0515fbc51f12fb27cc58.tar.bz2
mpv-3316cf5f9b213dc047aa0515fbc51f12fb27cc58.tar.xz
player: don't init/uninit terminal at runtime
This seems like an unnecessary complication.
-rw-r--r--player/loadfile.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/player/loadfile.c b/player/loadfile.c
index 5b52261f13..ccf4b6e33c 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1076,9 +1076,6 @@ static void play_current_file(struct MPContext *mpctx)
load_per_file_options(mpctx->mconfig, mpctx->playlist->current->params,
mpctx->playlist->current->num_params);
- if (opts->use_terminal && !opts->consolecontrols)
- getch2_disable();
-
#if HAVE_LIBASS
if (opts->ass_style_override)
ass_set_style_overrides(mpctx->ass_library, opts->ass_force_style_list);
@@ -1349,7 +1346,7 @@ goto_reopen_demuxer: ;
goto goto_reopen_demuxer;
}
-terminate_playback: // don't jump here after ao/vo/getch initialization!
+terminate_playback:
mp_nav_destroy(mpctx);
@@ -1380,9 +1377,6 @@ terminate_playback: // don't jump here after ao/vo/getch initialization!
if (mpctx->stop_play != PT_RESTART)
m_config_restore_backups(mpctx->mconfig);
- if (opts->use_terminal && opts->consolecontrols)
- getch2_enable();
-
mpctx->filename = NULL;
mpctx->resolve_result = NULL;
talloc_free(tmp);