-use-stdin renamed to -noconsolecontrols.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12817 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 17 insertions, 15 deletions

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index b8e7c4856f..53292f2122 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -523,6 +523,15 @@ Use an alternative menu.conf.
 .B \-menu-root <value> (OSD menu only)
 Specify the main menu.
 .TP
+.B \-noconsolecontrols
+Prevent MPlayer from reading key events from standard input.
+Useful when reading data from standard input.
+This is automatically enabled when \- is found on the command line.
+There are situations where you have to set it manually, e.g.
+if you open /dev/stdin (or the equivalent on your system), use stdin
+in a playlist or intend to read from stdin later on via the loadfile or
+loadlist slave commands.
+.TP
 .B \-nojoystick
 Turns off joystick support.
 .TP
@@ -586,15 +595,6 @@ Slow down or speed up playback by the factor given as parameter.
 .B \-sstep <sec>
 Display one frame every <sec> seconds.
 Useful for slideshows.
-.TP
-.B \-use-stdin
-Prevent MPlayer from reading key events from standard input.
-Useful when reading data from standard input.
-This is automatically enabled when \- is found on the command line.
-There are situations where you have to set it manually, e.g.
-if you open /dev/stdin (or the equivalent on your system), use stdin
-in a playlist or intend to read from stdin later on via the loadfile or
-loadlist slave commands.
 .
 .
 .SH "DEMUXER/STREAM OPTIONS"
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index ffe31bb8e6..1078046d6a 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -4,7 +4,7 @@
 
 #include "cfg-common.h"
 
-extern int use_stdin;
+extern int noconsolecontrols;
 
 #if defined(HAVE_FBDEV)||defined(HAVE_VESA)
 extern char *monitor_hfreq_str;
@@ -417,7 +417,9 @@ m_option_t mplayer_opts[]={
 #endif
 
 	{"slave", &slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, NULL},
-	{"use-stdin", &use_stdin, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
+	{"use-stdin", "-use-stdin has been renamed to -noconsolecontrols, use that instead.", CONF_TYPE_PRINT, 0, 0, 0, NULL},
+	{"noconsolecontrols", &noconsolecontrols, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
+	{"consolecontrols", &noconsolecontrols, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 0, NULL},
 
 #define MAIN_CONF
 #include "cfg-common.h"
diff --git a/mplayer.c b/mplayer.c
index badc6c10fd..c5052e4e9c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -184,7 +184,7 @@ extern void vf_list_plugins();
 
 // Common FIFO functions, and keyboard/event FIFO code
 #include "fifo.c"
-int use_stdin=0;
+int noconsolecontrols=0;
 //**************************************************************************//
 
 vo_functions_t *video_out=NULL;
@@ -1146,7 +1146,7 @@ if(slave_mode)
 #else
   mp_input_add_cmd_fd(0,0,mp_input_win32_slave_cmd_func,NULL);
 #endif
-else if(!use_stdin)
+else if(!noconsolecontrols)
 #ifndef HAVE_NO_POSIX_SELECT
   mp_input_add_key_fd(0,1,NULL,NULL);
 #else
@@ -1211,7 +1211,7 @@ play_next_file:
 
 // We must enable getch2 here to be able to interrupt network connection
 // or cache filling
-if(!use_stdin && !slave_mode){
+if(!noconsolecontrols && !slave_mode){
   if(inited_flags&INITED_GETCH2)
     mp_msg(MSGT_CPLAYER,MSGL_WARN,"WARNING: getch2_init called twice!\n");
   else
diff --git a/parser-mpcmd.c b/parser-mpcmd.c
index 20a268ac83..1864ae7686 100644
--- a/parser-mpcmd.c
+++ b/parser-mpcmd.c
@@ -236,7 +236,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
 
 	// Lock stdin if it will be used as input
 	if(strcasecmp(argv[i],"-") == 0)
-	  m_config_set_option(config,"use-stdin",NULL);
+	  m_config_set_option(config,"noconsolecontrols",NULL);
 	add_entry(&last_parent,&last_entry,entry);
 	UNSET_GLOBAL; // We start entry specific options