Mercurial > mplayer.hg

diff gui/ui/actions.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 af8838c2b60b
children 4ff933a89818
line wrap: on
line diff
--- a/gui/ui/actions.c	Thu Jan 12 10:07:22 2012 +0000
+++ b/gui/ui/actions.c	Thu Jan 12 10:08:25 2012 +0000
@@ -247,20 +247,10 @@
         return;
 
     switch (guiInfo.StreamType) {
-#ifdef CONFIG_CDDA
     case STREAMTYPE_CDDA:
-        break;
-#endif
-
-#ifdef CONFIG_VCD
     case STREAMTYPE_VCD:
-        break;
-#endif
-
-#ifdef CONFIG_DVDREAD
     case STREAMTYPE_DVD:
         break;
-#endif
 
     default:
 
@@ -291,25 +281,20 @@
         return;
 
     switch (guiInfo.StreamType) {
-#ifdef CONFIG_CDDA
     case STREAMTYPE_CDDA:
         if (--guiInfo.Track == 0) {
             guiInfo.Track = 1;
             stop = 1;
         }
         break;
-#endif
 
-#ifdef CONFIG_VCD
     case STREAMTYPE_VCD:
         if (--guiInfo.Track == 1) {
             guiInfo.Track = 2;
             stop = 1;
         }
         break;
-#endif
 
-#ifdef CONFIG_DVDREAD
     case STREAMTYPE_DVD:
 
         if (--guiInfo.Chapter == 0) {
@@ -322,7 +307,6 @@
         }
 
         break;
-#endif
 
     default:
 
@@ -354,7 +338,6 @@
         return;
 
     switch (guiInfo.StreamType) {
-#ifdef CONFIG_CDDA
     case STREAMTYPE_CDDA:
 
         if (++guiInfo.Track > guiInfo.Tracks) {
@@ -363,9 +346,7 @@
         }
 
         break;
-#endif
 
-#ifdef CONFIG_VCD
     case STREAMTYPE_VCD:
 
         if (++guiInfo.Track >= guiInfo.Tracks) {
@@ -374,9 +355,7 @@
         }
 
         break;
-#endif
 
-#ifdef CONFIG_DVDREAD
     case STREAMTYPE_DVD:
 
         if (guiInfo.Chapter++ == guiInfo.Chapters) {
@@ -389,7 +368,6 @@
         }
 
         break;
-#endif
 
     default: