[MPlayer-cvslog] CVS: main configure, 1.935, 1.936 parser-mpcmd.c, 1.17, 1.18

[Nicolas Plourde CVS]

CVS change done by Nicolas Plourde CVS

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

Modified Files:
	configure parser-mpcmd.c 
Log Message:
add support for macosx finder argument support (let you bundle mplayer to be a finder compliant .app) patch by Chris Roccati <roccati at pobox.com>

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.935
retrieving revision 1.936
diff -u -r1.935 -r1.936
--- configure	10 Nov 2004 00:26:41 -0000	1.935
+++ configure	10 Nov 2004 16:43:38 -0000	1.936
@@ -182,6 +182,7 @@
   --enable-fribidi       Enable using the FriBiDi libs [disabled]
   --disable-enca         Disable using ENCA charset oracle library [autodetect]
   --disable-macosx       Disable Mac OS X specific features [autodetect]
+  --enable-macosx-finder-support  Enable Mac OS X Finder invocation parameter parsing [disabled]
   --disable-inet6        Disable IPv6 support [autodetect]
   --disable-gethostbyname2  gethostbyname() function is not provided by the C
                             library [autodetect]
@@ -1381,6 +1382,7 @@
 _menu=no
 _qtx=auto
 _macosx=auto
+_macosx_finder_support=no
 _sortsub=yes
 _freetypeconfig='freetype-config'
 _fribidi=no
@@ -1648,6 +1650,8 @@
 
   --enable-macosx) _macosx=yes ;;
   --disable-macosx) _macosx=no ;;
+  --enable-macosx-finder-support) _macosx_finder_support=yes ;;
+  --disable-macosx-finder-support) _macosx_finder_support=no ;;
 
   --enable-sortsub) _sortsub=yes ;;
   --disable-sortsub) _sortsub=no ;;
@@ -3140,6 +3144,18 @@
 fi
 echores "$_macosx"
 
+echocheck "Mac OS X Finder Support"
+if test "$_macosx_finder_support" = auto ; then
+  _macosx_finder_support=$_macosx
+fi
+if test "$_macosx_finder_support" = yes; then
+  _def_macosx_finder_support='#define MACOSX_FINDER_SUPPORT 1'
+  _macosx_finder_support=yes
+else
+  _def_macosx_finder_support='#undef MACOSX_FINDER_SUPPORT'
+  _macosx_finder_support=no
+fi 
+echores "$_macosx_finder_support"
 
 echocheck "Samba support (libsmbclient)"
 if test "$_smbsupport" = yes; then
@@ -6571,6 +6587,7 @@
 XMMS_PLUGINS = $_xmms
 XMMS_LIB = $_xmms_lib
 MACOSX = $_macosx
+MACOSX_FINDER_SUPPORT = $_macosx_finder_support
 MACOSX_FRAMEWORKS = $_macosx_frameworks
 TOOLAME=$_toolame
 TOOLAME_EXTRAFLAGS=$_toolame_extraflags
@@ -6874,6 +6891,7 @@
 
 /* Mac OS X specific features */
 $_def_macosx
+$_def_macosx_finder_support
 
 /* Build our Win32-loader */
 $_def_win32_loader

Index: parser-mpcmd.c
===================================================================
RCS file: /cvsroot/mplayer/main/parser-mpcmd.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- parser-mpcmd.c	14 Jul 2004 09:25:47 -0000	1.17
+++ parser-mpcmd.c	10 Nov 2004 16:43:38 -0000	1.18
@@ -65,6 +65,9 @@
   char entbuf[10];
   int no_more_opts = 0;
   play_tree_t *last_parent, *last_entry = NULL, *root;
+#ifdef MACOSX_FINDER_SUPPORT
+  extern play_tree_t *macosx_finder_args(m_config_t *, int , char **);
+#endif
 
 #ifdef MP_DEBUG
   assert(config != NULL);
@@ -74,6 +77,12 @@
 
   config->mode = M_COMMAND_LINE;
   mode = GLOBAL;
+#ifdef MACOSX_FINDER_SUPPORT
+  root=macosx_finder_args(config, argc, argv);
+  if(root) 
+  	return root;
+#endif
+
   last_parent = root = play_tree_new();
   /* in order to work recursion detection properly in parse_config_file */
   ++recursion_depth;