[MPlayer-dev-eng] [PATCH] xml docs fix and mpst:// docs

[Murat ALKAN]

Are you good, Diego?

On Thu, 1 Jul 2004 03:51:39 +0200, Diego Biurrun <diego at biurrun.de> wrote:
> 
> Diego Biurrun writes:
> > Diego Biurrun writes:
> > > Diego Biurrun writes:
> > > > After more than a year without reaction and clever ideas I assume that
> > > > no better name will fall from the sky, so I will take matters into my
> > > > own hands and rename this option in the next days unless a storm of
> > > > protest erupts.
> > > >
> > > > So
> > > >   -use-stdin
> > > >
> > > > will be renamed to
> > > >
> > > >   -noconsolecontrols
> > >
> > > To be precise, I will commit the following patch unless you holler.
> >
> > [...]
> >
> > Please also update the manual page if you change an option name.
> 
> OK, your wish is my command, updated patch attached.
> 
> Diego
> 
> --- cfg-mplayer.h       28 Jun 2004 12:17:36 -0000      1.221
> +++ cfg-mplayer.h       1 Jul 2004 01:37:08 -0000
> @@ -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,8 @@
>  #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},
> 
>  #define MAIN_CONF
>  #include "cfg-common.h"
> --- parser-mpcmd.c      7 Jun 2004 18:58:08 -0000       1.16
> +++ parser-mpcmd.c      1 Jul 2004 01:37:08 -0000
> @@ -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
> 
> --- mplayer.c   26 Jun 2004 13:26:10 -0000      1.759
> +++ mplayer.c   1 Jul 2004 01:37:10 -0000
> @@ -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;
> @@ -907,7 +907,7 @@
>         mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
>         exit(0);
>        }
> -      mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
> +      mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_BuiltinCodecsConf);
>      }
>    }
>  }
> @@ -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
> --- DOCS/man/en/mplayer.1       30 Jun 2004 14:27:33 -0000      1.614
> +++ DOCS/man/en/mplayer.1       1 Jul 2004 01:49:48 -0000
> @@ -523,6 +523,14 @@
>  .B \-menu-root <value> (OSD menu only)
>  Specify the main menu.
>  .TP
> +.B \-noconsolecontrols
> +Standard input will be used to read data instead of key events.
> +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 you
> +.B need
> +this option.
> +.TP
>  .B \-nojoystick
>  Turns off joystick support.
>  .TP
> @@ -586,14 +594,6 @@
>  .B \-sstep <sec>
>  Display one frame every <sec> seconds.
>  Useful for slideshows.
> -.TP
> -.B \-use-stdin
> -Standard input will be used to read data instead of key events.
> -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 you
> -.B need
> -this option.
>  .
>  .
>  .SH "DEMUXER/STREAM OPTIONS"
> 
> 
> 
> _______________________________________________
> MPlayer-dev-eng mailing list
> MPlayer-dev-eng at mplayerhq.hu
> http://mplayerhq.hu/mailman/listinfo/mplayer-dev-eng
>