mirror of https://github.com/mpv-player/mpv
Fix win32 gui compilation.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30600 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
2c8f5fa622
commit
ff8c044318
|
@ -40,6 +40,7 @@
|
||||||
#include "stream/stream.h"
|
#include "stream/stream.h"
|
||||||
#include "libvo/video_out.h"
|
#include "libvo/video_out.h"
|
||||||
#include "gui/interface.h"
|
#include "gui/interface.h"
|
||||||
|
#include "gui/mplayer/gmplayer.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "dialogs.h"
|
#include "dialogs.h"
|
||||||
|
|
||||||
|
|
|
@ -105,7 +105,6 @@ int create_window(gui_t *gui, char *skindir);
|
||||||
int create_subwindow(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);
|
int parse_filename(char *file, play_tree_t *playtree, m_config_t *mconfig, int clear);
|
||||||
void capitalize(char *filename);
|
void capitalize(char *filename);
|
||||||
int import_playtree_playlist_into_gui(play_tree_t *my_playtree, m_config_t *config);
|
|
||||||
|
|
||||||
/* Dialogs */
|
/* Dialogs */
|
||||||
void display_playlistwindow(gui_t *gui);
|
void display_playlistwindow(gui_t *gui);
|
||||||
|
|
|
@ -39,14 +39,15 @@
|
||||||
#include "libvo/video_out.h"
|
#include "libvo/video_out.h"
|
||||||
#include "libao2/audio_out.h"
|
#include "libao2/audio_out.h"
|
||||||
#include "access_mpcontext.h"
|
#include "access_mpcontext.h"
|
||||||
|
#include "libmpcodecs/vd.h"
|
||||||
|
#include "gui/mplayer/gmplayer.h"
|
||||||
|
#include "mp_core.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "dialogs.h"
|
#include "dialogs.h"
|
||||||
#ifdef CONFIG_LIBCDIO
|
#ifdef CONFIG_LIBCDIO
|
||||||
#include <cdio/cdio.h>
|
#include <cdio/cdio.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern int abs_seek_pos;
|
|
||||||
extern float rel_seek_secs;
|
|
||||||
extern int vcd_track;
|
extern int vcd_track;
|
||||||
extern af_cfg_t af_cfg;
|
extern af_cfg_t af_cfg;
|
||||||
int guiWinID = 0;
|
int guiWinID = 0;
|
||||||
|
@ -466,7 +467,7 @@ static unsigned __stdcall GuiThread(void* param)
|
||||||
|
|
||||||
if(!skinName) skinName = strdup("Blue");
|
if(!skinName) skinName = strdup("Blue");
|
||||||
if(!mygui) mygui = create_gui(get_path("skins"), skinName, guiSetEvent);
|
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)
|
if(autosync && autosync != gtkAutoSync)
|
||||||
{
|
{
|
||||||
|
@ -683,7 +684,7 @@ int guiGetEvent(int type, char *arg)
|
||||||
mygui->uninit(mygui);
|
mygui->uninit(mygui);
|
||||||
free(mygui);
|
free(mygui);
|
||||||
mygui = NULL;
|
mygui = NULL;
|
||||||
exit_player("Done");
|
exit_player(EXIT_QUIT);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
case MP_CMD_GUI_STOP:
|
case MP_CMD_GUI_STOP:
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
#include "libvo/video_out.h"
|
#include "libvo/video_out.h"
|
||||||
#include "libao2/audio_out.h"
|
#include "libao2/audio_out.h"
|
||||||
#include "mixer.h"
|
#include "mixer.h"
|
||||||
|
#include "gui/mplayer/gmplayer.h"
|
||||||
#include "gui/interface.h"
|
#include "gui/interface.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
#include "mp_msg.h"
|
#include "mp_msg.h"
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
#include "m_option.h"
|
#include "m_option.h"
|
||||||
#include "libvo/video_out.h"
|
#include "libvo/video_out.h"
|
||||||
#include "mixer.h"
|
#include "mixer.h"
|
||||||
|
#include "gui/mplayer/gmplayer.h"
|
||||||
#include "gui/interface.h"
|
#include "gui/interface.h"
|
||||||
#include "gui.h"
|
#include "gui.h"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue