# HG changeset patch
# User diego
# Date 1266155371 0
# Node ID e3e329bc727a4ebe9f3922c974d81dab0ca56f6b
# Parent  18b9a39a5bac74ccb0ae935a552a9c6e259948f0
Avoid forward declarations for import_initial_playtree_into_gui() and
import_playtree_playlist_into_gui; declare them in interface.h instead.

diff -r 18b9a39a5bac -r e3e329bc727a gui/interface.h
--- a/gui/interface.h	Sun Feb 14 12:57:18 2010 +0000
+++ b/gui/interface.h	Sun Feb 14 13:49:31 2010 +0000
@@ -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   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 )                       \
diff -r 18b9a39a5bac -r e3e329bc727a mplayer.c
--- a/mplayer.c	Sun Feb 14 12:57:18 2010 +0000
+++ b/mplayer.c	Sun Feb 14 13:49:31 2010 +0000
@@ -129,9 +129,6 @@
 #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
 //**************************************************************************//