From 3316cf5f9b213dc047aa0515fbc51f12fb27cc58 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 24 May 2014 14:02:56 +0200 Subject: player: don't init/uninit terminal at runtime This seems like an unnecessary complication. --- player/loadfile.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'player') 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); -- cgit v1.2.3