diff --git a/include/cdio/sector.h b/include/cdio/sector.h
index 43bcd7ce..1d754129 100644
--- a/include/cdio/sector.h
+++ b/include/cdio/sector.h
@@ -1,5 +1,5 @@
 /*
-    $Id: sector.h,v 1.27 2004/08/30 00:26:59 rocky Exp $
+    $Id: sector.h,v 1.28 2004/08/30 01:01:14 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -286,13 +286,31 @@ bool cdio_is_discmode_dvd (discmode_t discmode);
 
 static inline bool discmode_is_cd(discmode_t discmode) 
 {
-  return discmode <= CDIO_DISC_MODE_CD_MIXED;
+  switch (discmode) {
+  case CDIO_DISC_MODE_CD_DA:
+  case CDIO_DISC_MODE_CD_DATA:
+  case CDIO_DISC_MODE_CD_XA:
+  case CDIO_DISC_MODE_CD_MIXED:
+    return true;
+  default: 
+    return false;
+  }
 }
 
 static inline bool discmode_is_dvd(discmode_t discmode) 
 {
-  return (discmode >= CDIO_DISC_MODE_DVD_ROM) 
-    && (discmode <= CDIO_DISC_MODE_DVD_OTHER);
+  switch (discmode) {
+  case CDIO_DISC_MODE_DVD_ROM:
+  case CDIO_DISC_MODE_DVD_RAM:
+  case CDIO_DISC_MODE_DVD_R:
+  case CDIO_DISC_MODE_DVD_RW:
+  case CDIO_DISC_MODE_DVD_PR:
+  case CDIO_DISC_MODE_DVD_PRW:
+  case CDIO_DISC_MODE_DVD_OTHER:
+    return true;
+  default: 
+    return false;
+  }
 }
 
 
diff --git a/src/cd-info.c b/src/cd-info.c
index 3f6c378c..32e52fb2 100644
--- a/src/cd-info.c
+++ b/src/cd-info.c
@@ -1,5 +1,5 @@
 /*
-    $Id: cd-info.c,v 1.85 2004/08/30 00:26:59 rocky Exp $
+    $Id: cd-info.c,v 1.86 2004/08/30 01:01:14 rocky Exp $
 
     Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
     Copyright (C) 1996, 1997, 1998  Gerd Knorr <kraxel@bytesex.org>
@@ -1033,7 +1033,7 @@ main(int argc, const char *argv[])
 	   discmode2str[discmode]);
   }
 
-  if (discmode_is_dvd && !opts.show_dvd) {
+  if (discmode_is_dvd(discmode) && !opts.show_dvd) {
     printf("No further information currently given for DVDs.\n");
     printf("Use --dvd to override.\n");
     myexit(p_cdio, EXIT_SUCCESS);