From ff8c0443186d870b70b6729d47ab548894b13f3c Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 16 Feb 2010 19:07:06 +0000
Subject: Fix win32 gui compilation.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30600 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 gui/win32/gui.c         | 1 +
 gui/win32/gui.h         | 1 -
 gui/win32/interface.c   | 9 +++++----
 gui/win32/preferences.c | 1 +
 gui/win32/wincfg.c      | 1 +
 5 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'gui')

diff --git a/gui/win32/gui.c b/gui/win32/gui.c
index d9d86f58a3..66940bc209 100644
--- a/gui/win32/gui.c
+++ b/gui/win32/gui.c
@@ -40,6 +40,7 @@
 #include "stream/stream.h"
 #include "libvo/video_out.h"
 #include "gui/interface.h"
+#include "gui/mplayer/gmplayer.h"
 #include "gui.h"
 #include "dialogs.h"
 
diff --git a/gui/win32/gui.h b/gui/win32/gui.h
index d8578dc96f..72e90f2538 100644
--- a/gui/win32/gui.h
+++ b/gui/win32/gui.h
@@ -105,7 +105,6 @@ int create_window(gui_t *gui, char *skindir);
 int create_subwindow(gui_t *gui, char *skindir);
 int parse_filename(char *file, play_tree_t *playtree, m_config_t *mconfig, int clear);
 void capitalize(char *filename);
-int import_playtree_playlist_into_gui(play_tree_t *my_playtree, m_config_t *config);
 
 /* Dialogs */
 void display_playlistwindow(gui_t *gui);
diff --git a/gui/win32/interface.c b/gui/win32/interface.c
index 209a1889d4..d74c76a356 100644
--- a/gui/win32/interface.c
+++ b/gui/win32/interface.c
@@ -39,14 +39,15 @@
 #include "libvo/video_out.h"
 #include "libao2/audio_out.h"
 #include "access_mpcontext.h"
+#include "libmpcodecs/vd.h"
+#include "gui/mplayer/gmplayer.h"
+#include "mp_core.h"
 #include "gui.h"
 #include "dialogs.h"
 #ifdef CONFIG_LIBCDIO
 #include <cdio/cdio.h>
 #endif
 
-extern int abs_seek_pos;
-extern float rel_seek_secs;
 extern int vcd_track;
 extern af_cfg_t af_cfg;
 int guiWinID = 0;
@@ -466,7 +467,7 @@ static unsigned __stdcall GuiThread(void* param)
 
     if(!skinName) skinName = strdup("Blue");
     if(!mygui) mygui = create_gui(get_path("skins"), skinName, guiSetEvent);
-    if(!mygui) exit_player("Unable to load GUI.");
+    if(!mygui) exit_player(EXIT_ERROR);
 
     if(autosync && autosync != gtkAutoSync)
     {
@@ -683,7 +684,7 @@ int guiGetEvent(int type, char *arg)
                     mygui->uninit(mygui);
                     free(mygui);
                     mygui = NULL;
-                    exit_player("Done");
+                    exit_player(EXIT_QUIT);
                     return 0;
                 }
                 case MP_CMD_GUI_STOP:
diff --git a/gui/win32/preferences.c b/gui/win32/preferences.c
index 2a98b2d807..868c687208 100644
--- a/gui/win32/preferences.c
+++ b/gui/win32/preferences.c
@@ -30,6 +30,7 @@
 #include "libvo/video_out.h"
 #include "libao2/audio_out.h"
 #include "mixer.h"
+#include "gui/mplayer/gmplayer.h"
 #include "gui/interface.h"
 #include "gui.h"
 #include "mp_msg.h"
diff --git a/gui/win32/wincfg.c b/gui/win32/wincfg.c
index 245bbc0be2..33d5ae9fd6 100644
--- a/gui/win32/wincfg.c
+++ b/gui/win32/wincfg.c
@@ -32,6 +32,7 @@
 #include "m_option.h"
 #include "libvo/video_out.h"
 #include "mixer.h"
+#include "gui/mplayer/gmplayer.h"
 #include "gui/interface.h"
 #include "gui.h"
 
-- 
cgit v1.2.3