[MPlayer-cvslog] r37322 - trunk/gui/dialog/menu.c

[ib]

Author: ib
Date: Sun Nov  2 14:37:34 2014
New Revision: 37322

Log:
Fix GUI compilation errors after removal of the internal libdvd*.

The GUI did not compile without DVD support which is default
after r37317 now if there are no external DVD libraries available.

Reported by Giorgio Vazzana, mywing81 gmail com.

Modified:
   trunk/gui/dialog/menu.c

Modified: trunk/gui/dialog/menu.c
==============================================================================
--- trunk/gui/dialog/menu.c	Sun Nov  2 11:07:39 2014	(r37321)
+++ trunk/gui/dialog/menu.c	Sun Nov  2 14:37:34 2014	(r37322)
@@ -49,6 +49,8 @@
 #include "libavutil/avstring.h"
 
 #include "pixmaps/about.xpm"
+#include "pixmaps/audio.xpm"
+#include "pixmaps/video.xpm"
 #include "pixmaps/half.xpm"
 #include "pixmaps/normal.xpm"
 #include "pixmaps/double.xpm"
@@ -91,8 +93,6 @@
 #include "pixmaps/playdvd.xpm"
 #include "pixmaps/chapter.xpm"
 #include "pixmaps/dolby.xpm"
-#include "pixmaps/audio.xpm"
-#include "pixmaps/video.xpm"
 #endif
 #ifdef CONFIG_TV
 #include "pixmaps/tv.xpm"
@@ -231,7 +231,6 @@ typedef struct
  const char * name;
 } Languages_t;
 
-#ifdef CONFIG_DVDREAD
 #define lng( a,b ) ( (int)(a) * 256 + b )
 static Languages_t Languages[] =
 {
@@ -405,10 +404,12 @@ static Languages_t Languages[] =
   { lng( 'z','u' ), "zul", "isiZulu"                         },
 };
 
+#ifdef CONFIG_DVDREAD
 static char * ChannelTypes[] =
   { "Dolby Digital","","Mpeg1","Mpeg2","PCM","","Digital Theatre System" };
 static char * ChannelNumbers[] =
   { "","Stereo","","","","5.1" };
+#endif
 
 enum
 {
@@ -438,10 +439,11 @@ static const char * GetLanguage( void *l
  return MSGTR_GUI_Unknown;
 }
 #undef lng
-#endif
 
 
+#ifdef CONFIG_DVDREAD
 static GtkWidget * DVDSubMenu;
+#endif
 GtkWidget * DVDTitleMenu;
 GtkWidget * DVDChapterMenu;
 GtkWidget * DVDAudioLanguageMenu;