[Mplayer-cvslog] CVS: main cfg-mplayer.h, 1.221, 1.222 mplayer.c, 1.760, 1.761 parser-mpcmd.c, 1.16, 1.17

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv13241

Modified Files:
	cfg-mplayer.h mplayer.c parser-mpcmd.c 
Log Message:
-use-stdin renamed to -noconsolecontrols.


Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- cfg-mplayer.h	28 Jun 2004 12:17:36 -0000	1.221
+++ cfg-mplayer.h	14 Jul 2004 09:25:47 -0000	1.222
@@ -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 @@
 #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"

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.760
retrieving revision 1.761
diff -u -r1.760 -r1.761
--- mplayer.c	2 Jul 2004 22:20:10 -0000	1.760
+++ mplayer.c	14 Jul 2004 09:25:47 -0000	1.761
@@ -184,7 +184,7 @@
 
 // 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 @@
 #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 @@
 
 // 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

Index: parser-mpcmd.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-mpcmd.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- parser-mpcmd.c	7 Jun 2004 18:58:08 -0000	1.16
+++ parser-mpcmd.c	14 Jul 2004 09:25:47 -0000	1.17
@@ -236,7 +236,7 @@
 
 	// 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