Avoid forward declarations for import_initial_playtree_into_gui() and

import_playtree_playlist_into_gui; declare them in interface.h instead.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30575 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 7 insertions, 3 deletions

diff --git a/gui/interface.h b/gui/interface.h
index 5ac532c481..59d0cbac47 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -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 )                       \
diff --git a/mplayer.c b/mplayer.c
index 41d2e63be8..e2d9bd6f9b 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -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
 //**************************************************************************//