From db527762f6c1f443d5ab9a18000052001a223fde Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 15 Nov 2004 10:00:58 +0000 Subject: warning fix git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13949 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Gui/mplayer/gtk/menu.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Gui/mplayer/gtk/menu.c b/Gui/mplayer/gtk/menu.c index c986fee0df..8f841330cf 100644 --- a/Gui/mplayer/gtk/menu.c +++ b/Gui/mplayer/gtk/menu.c @@ -28,8 +28,6 @@ #include "../pixmaps/skin.xpm" #include "../pixmaps/sound.xpm" #include "../pixmaps/open.xpm" -#include "../pixmaps/dvd.xpm" -#include "../pixmaps/vcd.xpm" #include "../pixmaps/play.xpm" #include "../pixmaps/stop2.xpm" #include "../pixmaps/pause.xpm" @@ -40,20 +38,26 @@ #include "../pixmaps/a169.xpm" #include "../pixmaps/a235.xpm" #include "../pixmaps/a43.xpm" -#include "../pixmaps/playdvd.xpm" -#include "../pixmaps/playvcd.xpm" #include "../pixmaps/file2.xpm" #include "../pixmaps/url.xpm" #include "../pixmaps/sub.xpm" #include "../pixmaps/delsub.xpm" #include "../pixmaps/empty.xpm" -#include "../pixmaps/empty1px.xpm" -#include "../pixmaps/tongue.xpm" -#include "../pixmaps/tonguebla.xpm" -#include "../pixmaps/dolby.xpm" #include "../pixmaps/loadeaf.xpm" #include "../pixmaps/title.xpm" +#ifdef USE_DVDREAD +#include "../pixmaps/dvd.xpm" +#include "../pixmaps/playdvd.xpm" #include "../pixmaps/chapter.xpm" +#include "../pixmaps/dolby.xpm" +#include "../pixmaps/tongue.xpm" +#include "../pixmaps/tonguebla.xpm" +#include "../pixmaps/empty1px.xpm" +#endif +#ifdef HAVE_VCD +#include "../pixmaps/vcd.xpm" +#include "../pixmaps/playvcd.xpm" +#endif extern mixer_t mixer; // mixer from mplayer.c @@ -357,10 +361,12 @@ static Languages_t Languages[] = }; #undef lng +#ifdef USE_DVDREAD static char * ChannelTypes[] = { "Dolby Digital","","Mpeg1","Mpeg2","PCM","","Digital Theatre System" }; static char * ChannelNumbers[] = { "","Stereo","","","","5.1" }; +#endif char * GetLanguage( int language ) { -- cgit v1.2.3