[MPlayer-cvslog] r30575 - in trunk: gui/interface.h mplayer.c

[diego]

Author: diego
Date: Sun Feb 14 14:49:31 2010
New Revision: 30575

Log:
Avoid forward declarations for import_initial_playtree_into_gui() and
import_playtree_playlist_into_gui; declare them in interface.h instead.

Modified:
   trunk/gui/interface.h
   trunk/mplayer.c

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Sun Feb 14 13:57:18 2010	(r30574)
+++ trunk/gui/interface.h	Sun Feb 14 14:49:31 2010	(r30575)
@@ -20,6 +20,8 @@
 #define MPLAYER_GUI_INTERFACE_H
 
 #include "config.h"
+#include "m_config.h"
+#include "playtree.h"
 #include "mplayer/play.h"
 #include "libvo/font_load.h"
 #include "cfg.h"
@@ -228,6 +230,11 @@ void   gfree( void ** p );
 void   gaddlist( char *** list, const char * entry );
 char * gstrchr( char * str, int c );
 
+int import_initial_playtree_into_gui(play_tree_t* my_playtree,
+                                     m_config_t* config, int enqueue);
+int import_playtree_playlist_into_gui(play_tree_t* my_playtree,
+                                      m_config_t* config);
+
 #define guiSetFilename( s,n ) { gfree( (void **)&s ); s=gstrdup( n ); }
 
 #define guiSetDF( s,d,n )                       \

Modified: trunk/mplayer.c
==============================================================================
--- trunk/mplayer.c	Sun Feb 14 13:57:18 2010	(r30574)
+++ trunk/mplayer.c	Sun Feb 14 14:49:31 2010	(r30575)
@@ -129,9 +129,6 @@ char *heartbeat_cmd;
 #include "playtree.h"
 #include "playtreeparser.h"
 
-int import_playtree_playlist_into_gui(play_tree_t* my_playtree, m_config_t* config);
-int import_initial_playtree_into_gui(play_tree_t* my_playtree, m_config_t* config, int enqueue);
-
 //**************************************************************************//
 //             Config
 //**************************************************************************//