Mercurial > mplayer.hg

diff gui/ui/gtk/menu.c @ 34454:5a45efc630b8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove all unnecessary #ifdefs from GUI code. Move or add necessary ones.
author ib
date Thu, 12 Jan 2012 10:08:25 +0000
parents 536ab2e339b8
children 70c63fd20b4b
line wrap: on
line diff
--- a/gui/ui/gtk/menu.c	Thu Jan 12 10:07:22 2012 +0000
+++ b/gui/ui/gtk/menu.c	Thu Jan 12 10:08:25 2012 +0000
@@ -207,6 +207,7 @@
  const char * name;
 } Languages_t;
 
+#ifdef CONFIG_DVDREAD
 #define lng( a,b ) ( (int)(a) * 256 + b )
 static Languages_t Languages[] =
          {
@@ -384,12 +385,10 @@
          };
 #undef lng
 
-#ifdef CONFIG_DVDREAD
 static char * ChannelTypes[] =
 	{ "Dolby Digital","","Mpeg1","Mpeg2","PCM","","Digital Theatre System" };
 static char * ChannelNumbers[] =
 	{ "","Stereo","","","","5.1" };
-#endif
 
 static const char * GetLanguage( int language )
 {
@@ -398,6 +397,7 @@
   if ( Languages[i].id == language ) return Languages[i].name;
  return NULL;
 }
+#endif
 
 
 GtkWidget * DVDSubMenu;