[MPlayer-cvslog] r30717 - in trunk: osdep/macosx_finder_args.c osdep/macosx_finder_args.h parser-mpcmd.c

[diego]

Author: diego
Date: Tue Feb 23 08:54:10 2010
New Revision: 30717

Log:
Add header for macosx_finder_args() instead of forward declaring it.

Added:
   trunk/osdep/macosx_finder_args.h
Modified:
   trunk/osdep/macosx_finder_args.c
   trunk/parser-mpcmd.c

Modified: trunk/osdep/macosx_finder_args.c
==============================================================================
--- trunk/osdep/macosx_finder_args.c	Tue Feb 23 07:42:51 2010	(r30716)
+++ trunk/osdep/macosx_finder_args.c	Tue Feb 23 08:54:10 2010	(r30717)
@@ -23,6 +23,7 @@
 #include "m_option.h"
 #include "m_config.h"
 #include "playtree.h"
+#include "macosx_finder_args.h"
 
 static play_tree_t *files=NULL;
 

Added: trunk/osdep/macosx_finder_args.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/osdep/macosx_finder_args.h	Tue Feb 23 08:54:10 2010	(r30717)
@@ -0,0 +1,26 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_MACOSX_FINDER_ARGS_H
+#define MPLAYER_MACOSX_FINDER_ARGS_H
+
+#include "playtree.h"
+
+play_tree_t *macosx_finder_args(m_config_t *config, int argc, char **argv);
+
+#endif /* MPLAYER_MACOSX_FINDER_ARGS_H */

Modified: trunk/parser-mpcmd.c
==============================================================================
--- trunk/parser-mpcmd.c	Tue Feb 23 07:42:51 2010	(r30716)
+++ trunk/parser-mpcmd.c	Tue Feb 23 08:54:10 2010	(r30717)
@@ -36,6 +36,7 @@
 #include "m_config.h"
 #include "playtree.h"
 #include "parser-mpcmd.h"
+#include "osdep/macosx_finder_args.h"
 
 static int recursion_depth = 0;
 static int mode = 0;
@@ -91,9 +92,6 @@ m_config_parse_mp_command_line(m_config_
   int no_more_opts = 0;
   int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything
   play_tree_t *last_parent, *last_entry = NULL, *root;
-#ifdef CONFIG_MACOSX_FINDER
-  play_tree_t *macosx_finder_args(m_config_t *, int , char **);
-#endif
 
 #ifdef MP_DEBUG
   assert(config != NULL);