diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-29 14:08:24 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-29 14:08:24 +0000 |
| commit | f9b2e78d799f0e6fc440ad96ab85107386108ca9 (patch) | |
| tree | 2137585bf61d716030564abc3dac07fc67ce6d50 /Gui | |
| parent | 4373e71a95dcaa2808af93c7130fb58f736d917c (diff) | |
| download | mpv-f9b2e78d799f0e6fc440ad96ab85107386108ca9.tar.bz2 mpv-f9b2e78d799f0e6fc440ad96ab85107386108ca9.tar.xz | |
Remove some of the worst "headers include headers which include
completely unrelated headers" mess.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21386 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/interface.h | 3 | ||||
| -rw-r--r-- | Gui/mplayer/gtk/fs.c | 1 | ||||
| -rw-r--r-- | Gui/mplayer/gtk/opts.c | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Gui/interface.h b/Gui/interface.h index 2720c64c7f..4e5475aaf1 100644 --- a/Gui/interface.h +++ b/Gui/interface.h @@ -4,7 +4,6 @@ #include "../config.h" #include "mplayer/play.h" -#include "mplayer.h" #include "libvo/font_load.h" #include "cfg.h" @@ -142,6 +141,8 @@ extern guiInterface_t guiIntfStruct; #define guiFilenames 4 #define guiALL 0xffffffff +extern int use_gui; + extern char *get_path(const char *filename); extern void guiInit( void ); diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c index 8039b20a56..9b5923351d 100644 --- a/Gui/mplayer/gtk/fs.c +++ b/Gui/mplayer/gtk/fs.c @@ -7,6 +7,7 @@ #include <unistd.h> #include "../gmplayer.h" +#include "../../mplayer.h" #include "mplayer/pixmaps/up.xpm" #include "mplayer/pixmaps/dir.xpm" diff --git a/Gui/mplayer/gtk/opts.c b/Gui/mplayer/gtk/opts.c index 3c5c4b2191..25a86f2c09 100644 --- a/Gui/mplayer/gtk/opts.c +++ b/Gui/mplayer/gtk/opts.c @@ -12,6 +12,7 @@ #include "../../mixer.h" #include "../../libao2/audio_out.h" #include "../../libvo/video_out.h" +#include "../../mplayer.h" #include "../app.h" #include "../cfg.h" |