Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv7836 Modified Files: cfg-mplayer.h configure mplayer.c mplayer.h Log Message: fix (?) cmd line handling Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.159 retrieving revision 1.160 diff -u -r1.159 -r1.160 --- cfg-mplayer.h 5 Aug 2002 00:39:06 -0000 1.159 +++ cfg-mplayer.h 15 Aug 2002 22:52:50 -0000 1.160 @@ -322,8 +322,8 @@ {"lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif - {"gui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, - {"nogui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, + {"gui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCMD, 0, 1, NULL}, +// {"nogui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, #ifdef HAVE_NEW_GUI {"skin", &skinName, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.537 retrieving revision 1.538 diff -u -r1.537 -r1.538 --- configure 14 Aug 2002 21:43:48 -0000 1.537 +++ configure 15 Aug 2002 22:52:50 -0000 1.538 @@ -160,6 +160,7 @@ --disable-new-input disable new input system [enable] --enable-joystick enable joystick support in new input [disable] --enable-i18n GNU internationalisation [disable] + --disable-setlocale disable setlocale using in mplayer [autodetect] --enable-runtime-cpudetection Enable runtime CPU detection [disable] --disable-dvdnav Disable dvdnav support [autodetect] --disable-dvdread Disable libdvdread support [autodetect] @@ -975,6 +976,7 @@ _shm=auto _linux_devfs=no _i18n=no +_setlocale=auto _sighandler=yes _libdv=auto _cdparanoia=auto @@ -1000,6 +1002,8 @@ --disable-mencoder) _mencoder=no ;; --enable-i18n) _i18n=yes ;; --disable-i18n) _i18n=no ;; + --enable-setlocale) _setlocale=yes ;; + --disable-setlocale) _setlocale=no ;; --enable-x11) _x11=yes ;; --disable-x11) _x11=no ;; --enable-xv) _xv=yes ;; @@ -1427,6 +1431,26 @@ echores "$_i18n" +# Checking for setlocale() ... +# CSAK EGY MARADHAT - A HEGYLAKO +# Nemnem. a TV Maci ! +echocheck "setlocale()" +if test "$_setlocale" = auto ; then + cat > $TMPC <<EOF +#include <locale.h> +int main(void) { setlocale( LC_ALL,"" ); return 0; } +EOF + _setlocale=no + cc_check && _setlocale=yes +fi +if test "$_setlocale" = yes ; then + _def_setlocale='#define USE_SETLOCALE 1' +else + _def_setlocale='#undef USE_SETLOCALE' +fi +echores "$_setlocale" + + echocheck "language" test -z "$LINGUAS" && LINGUAS="en" if test -f "help_mp-${LINGUAS}.h" ; then @@ -4256,6 +4280,9 @@ /* use GNU internationalization */ $_def_i18n + +/* use setlocale() function */ +$_def_setlocale /* Runtime CPU detection */ $_def_runtime_cpudetection Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.546 retrieving revision 1.547 diff -u -r1.546 -r1.547 --- mplayer.c 14 Aug 2002 23:02:42 -0000 1.546 +++ mplayer.c 15 Aug 2002 22:52:50 -0000 1.547 @@ -582,7 +582,9 @@ mp_register_options(mconfig); parse_cfgfiles(mconfig); - +#ifdef HAVE_NEW_GUI + if ( use_gui ) cfg_read(); +#endif if(m_config_parse_command_line(mconfig, argc, argv, envp) < 0) exit(1); // error parsing cmdline Index: mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mplayer.h 25 Jul 2002 20:34:33 -0000 1.12 +++ mplayer.h 15 Aug 2002 22:52:50 -0000 1.13 @@ -23,8 +23,17 @@ extern float sub_delay; extern float sub_fps; extern int sub_auto; +extern int sub_pos; +extern int sub_unicode; extern char * filename; + +extern int flip; +extern int force_ni; +extern int index_mode; +extern int frame_dropping; + +extern int auto_quality; extern void exit_player(char* how);