[xiph-commits] r11808 - trunk/cdparanoia

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2006-08-29 14:29:03 -0700 (Tue, 29 Aug 2006)
New Revision: 11808

Modified:
   trunk/cdparanoia/main.c
Log:
Fix -q so that it's quiet even in error situations (return code is nonzero; that is enough)



Modified: trunk/cdparanoia/main.c
===================================================================
--- trunk/cdparanoia/main.c	2006-08-29 20:57:56 UTC (rev 11807)
+++ trunk/cdparanoia/main.c	2006-08-29 21:29:03 UTC (rev 11808)
@@ -847,12 +847,16 @@
       report("\nUnable to open cdrom drive; -v will give more information.");
     exit(1);
   }
+  
+  if(quiet)
+    cdda_verbose_set(d,CDDA_MESSAGE_FORGETIT,CDDA_MESSAGE_FORGETIT);
+  else{
+    if(verbose)
+      cdda_verbose_set(d,CDDA_MESSAGE_PRINTIT,CDDA_MESSAGE_PRINTIT);
+    else
+      cdda_verbose_set(d,CDDA_MESSAGE_PRINTIT,CDDA_MESSAGE_FORGETIT);
+  }
 
-  if(verbose)
-    cdda_verbose_set(d,CDDA_MESSAGE_PRINTIT,CDDA_MESSAGE_PRINTIT);
-  else
-    cdda_verbose_set(d,CDDA_MESSAGE_PRINTIT,CDDA_MESSAGE_FORGETIT);
-
   /* possibly force hand on endianness of drive, sector request size */
   if(force_cdrom_endian!=-1){
     d->bigendianp=force_cdrom_endian;