Mercurial > mplayer.hg
changeset 30675:059153d06619
Add header for macosx_finder_args() instead of forward declaring it.
| author | diego |
|---|---|
| date | Tue, 23 Feb 2010 07:54:10 +0000 |
| parents | 553f53cffabf |
| children | 13b7aa964af6 |
| files | osdep/macosx_finder_args.c osdep/macosx_finder_args.h parser-mpcmd.c |
| diffstat | 3 files changed, 28 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/osdep/macosx_finder_args.c Tue Feb 23 06:42:51 2010 +0000 +++ b/osdep/macosx_finder_args.c Tue Feb 23 07:54:10 2010 +0000 @@ -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;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/osdep/macosx_finder_args.h Tue Feb 23 07:54:10 2010 +0000 @@ -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 */
--- a/parser-mpcmd.c Tue Feb 23 06:42:51 2010 +0000 +++ b/parser-mpcmd.c Tue Feb 23 07:54:10 2010 +0000 @@ -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 @@ 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);