From e016ed4fc47b5fbab4bffd833524a89e788d4317 Mon Sep 17 00:00:00 2001 From: albeu Date: Sun, 24 Feb 2002 12:05:12 +0000 Subject: Fix my mistake (forgot to remove a getch2_enable) but in the rigth way this time, otherwise you can't interrupt network connection and cache filling from the keyboard git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4836 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/mplayer.c b/mplayer.c index 4973036eed..e7c168830f 100644 --- a/mplayer.c +++ b/mplayer.c @@ -756,13 +756,12 @@ current_module = NULL; play_next_file: -// We can enable getch2 *either* here *or* on a per-file basis, but NOT both!!! -// Doing it both places causes the saved terminal state to get trashed!! -// Maybe this can be renabled at a later date if it's useful... -//if(!use_stdin && !slave_mode){ -// getch2_enable(); // prepare stdin for hotkeys... -// inited_flags|=INITED_GETCH2; -//} +// We must enable getch2 here to be able to interrupt network connection +// or cache filling +if(!use_stdin && !slave_mode){ + getch2_enable(); // prepare stdin for hotkeys... + inited_flags|=INITED_GETCH2; +} #ifdef HAVE_NEW_GUI if ( use_gui ) { @@ -1555,11 +1554,6 @@ if(force_fps){ mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_StartPlaying);fflush(stdout); -if(!use_stdin && !slave_mode){ - getch2_enable(); // prepare stdin for hotkeys... - inited_flags|=INITED_GETCH2; -} - InitTimer(); total_time_usage_start=GetTimer(); -- cgit v1.2.3