RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix win32 gui compilation. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30600 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-02-16 19:07:06 +00:00
parent 2c8f5fa622
commit ff8c044318
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gui/win32/gui.c
View File

@ -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"

1
gui/win32/gui.h
View File

@ -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);

9
gui/win32/interface.c
View File

@ -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:

1
gui/win32/preferences.c
View File

@ -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"

1
gui/win32/wincfg.c
View File

@ -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"