diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 18:37:37 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 18:37:37 +0000 |
| commit | 9b56c962e7ef2675a5ad0054bd7844928ed2a32d (patch) | |
| tree | 75ead7eb78b6322adaede3a5840ccbb028a10306 /Gui | |
| parent | 18d719d7f5e2a5525402ae0061dc8666814784a2 (diff) | |
| download | mpv-9b56c962e7ef2675a5ad0054bd7844928ed2a32d.tar.bz2 mpv-9b56c962e7ef2675a5ad0054bd7844928ed2a32d.tar.xz | |
Rename Gui/mplayer/mplayer.h to gmplayer.h, another file named mplayer.h
already exists, both get included at the same time in some files...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21243 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/app.c | 2 | ||||
| -rw-r--r-- | Gui/interface.c | 2 | ||||
| -rw-r--r-- | Gui/mplayer/gmplayer.h (renamed from Gui/mplayer/mplayer.h) | 0 | ||||
| -rw-r--r-- | Gui/mplayer/gtk/fs.c | 2 | ||||
| -rw-r--r-- | Gui/mplayer/pb.c | 2 | ||||
| -rw-r--r-- | Gui/mplayer/play.c | 2 |
6 files changed, 5 insertions, 5 deletions
@@ -11,7 +11,7 @@ #include "app.h" #include "wm/wskeys.h" #include "skin/skin.h" -#include "mplayer/mplayer.h" +#include "mplayer/gmplayer.h" #include "interface.h" evName evNames[] = diff --git a/Gui/interface.c b/Gui/interface.c index d642c33e20..a92254fde8 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -12,7 +12,7 @@ #include "mplayer/gtk/eq.h" #include "mplayer/widgets.h" -#include "mplayer/mplayer.h" +#include "mplayer/gmplayer.h" #include "mplayer/play.h" #include "mplayer.h" diff --git a/Gui/mplayer/mplayer.h b/Gui/mplayer/gmplayer.h index d7bd01b1ac..d7bd01b1ac 100644 --- a/Gui/mplayer/mplayer.h +++ b/Gui/mplayer/gmplayer.h diff --git a/Gui/mplayer/gtk/fs.c b/Gui/mplayer/gtk/fs.c index 17801ed5eb..8039b20a56 100644 --- a/Gui/mplayer/gtk/fs.c +++ b/Gui/mplayer/gtk/fs.c @@ -6,7 +6,7 @@ #include <glob.h> #include <unistd.h> -#include "../mplayer.h" +#include "../gmplayer.h" #include "mplayer/pixmaps/up.xpm" #include "mplayer/pixmaps/dir.xpm" diff --git a/Gui/mplayer/pb.c b/Gui/mplayer/pb.c index 01c0013136..14ea8d97cc 100644 --- a/Gui/mplayer/pb.c +++ b/Gui/mplayer/pb.c @@ -20,12 +20,12 @@ #include "../stream/stream.h" #include "../mixer.h" #include "../libvo/sub.h" -#include "../mplayer.h" #include "../libmpdemux/demuxer.h" #include "../libmpdemux/stheader.h" #include "../codec-cfg.h" +#include "gmplayer.h" #include "play.h" #include "widgets.h" #include "common.h" diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index c20aae35f3..72345eecc3 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -22,7 +22,7 @@ #include "interface.h" #include "widgets.h" -#include "./mplayer.h" +#include "gmplayer.h" #include "play.h" #include "skin/skin.h" |