diff options
author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-24 12:05:12 +0000 |
---|---|---|
committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-24 12:05:12 +0000 |
commit | e016ed4fc47b5fbab4bffd833524a89e788d4317 (patch) | |
tree | 00ceed037ace1a07c84fc52519a06dd6582bd901 /mplayer.c | |
parent | 5f2178bed7fd32e8d4897627912c0aa8ac11fc69 (diff) | |
download | mpv-e016ed4fc47b5fbab4bffd833524a89e788d4317.tar.bz2 mpv-e016ed4fc47b5fbab4bffd833524a89e788d4317.tar.xz |
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
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 18 |
1 files changed, 6 insertions, 12 deletions
@@ -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(); |