# HG changeset patch
# User reimar
# Date 1266347226 0
# Node ID 71acebef19ec81543a4d162cb9782f1c2ec4ac16
# Parent  74a6c2a3dcceaaf3edff569ce7467e7c03e923d3
Fix win32 gui compilation.

diff -r 74a6c2a3dcce -r 71acebef19ec gui/win32/gui.c
--- a/gui/win32/gui.c	Tue Feb 16 16:32:38 2010 +0000
+++ b/gui/win32/gui.c	Tue Feb 16 19:07:06 2010 +0000
@@ -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 -r 74a6c2a3dcce -r 71acebef19ec gui/win32/gui.h
--- a/gui/win32/gui.h	Tue Feb 16 16:32:38 2010 +0000
+++ b/gui/win32/gui.h	Tue Feb 16 19:07:06 2010 +0000
@@ -105,7 +105,6 @@
 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 -r 74a6c2a3dcce -r 71acebef19ec gui/win32/interface.c
--- a/gui/win32/interface.c	Tue Feb 16 16:32:38 2010 +0000
+++ b/gui/win32/interface.c	Tue Feb 16 19:07:06 2010 +0000
@@ -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 @@
 
     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 @@
                     mygui->uninit(mygui);
                     free(mygui);
                     mygui = NULL;
-                    exit_player("Done");
+                    exit_player(EXIT_QUIT);
                     return 0;
                 }
                 case MP_CMD_GUI_STOP:
diff -r 74a6c2a3dcce -r 71acebef19ec gui/win32/preferences.c
--- a/gui/win32/preferences.c	Tue Feb 16 16:32:38 2010 +0000
+++ b/gui/win32/preferences.c	Tue Feb 16 19:07:06 2010 +0000
@@ -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 -r 74a6c2a3dcce -r 71acebef19ec gui/win32/wincfg.c
--- a/gui/win32/wincfg.c	Tue Feb 16 16:32:38 2010 +0000
+++ b/gui/win32/wincfg.c	Tue Feb 16 19:07:06 2010 +0000
@@ -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"