[Mplayer-cvslog] CVS: main mplayer.c,1.407,1.408

[Alban Bedel CVS]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv3392

Modified Files:
	mplayer.c 
Log Message:
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


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.407
retrieving revision 1.408
diff -u -r1.407 -r1.408
--- mplayer.c	24 Feb 2002 11:23:48 -0000	1.407
+++ mplayer.c	24 Feb 2002 12:05:12 -0000	1.408
@@ -756,13 +756,12 @@
 
 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 ) {
@@ -1554,11 +1553,6 @@
 //==================== START PLAYING =======================
 
 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();