[xiph-commits] r11811 - in trunk/cdparanoia: . interface

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2006-08-29 15:01:52 -0700 (Tue, 29 Aug 2006)
New Revision: 11811

Modified:
   trunk/cdparanoia/interface/scan_devices.c
   trunk/cdparanoia/main.c
Log:
oof, it;s the redhat patches that hashed up the reporting; reverting
it all to the original code.



Modified: trunk/cdparanoia/interface/scan_devices.c
===================================================================
--- trunk/cdparanoia/interface/scan_devices.c	2006-08-29 21:40:54 UTC (rev 11810)
+++ trunk/cdparanoia/interface/scan_devices.c	2006-08-29 22:01:52 UTC (rev 11811)
@@ -101,7 +101,8 @@
 
 cdrom_drive *cdda_identify(const char *device, int messagedest,char **messages){
   struct stat st;
-  cdrom_drive *d=NULL;
+  cdrom_drive *d=NULL;  
+
   idmessage(messagedest,messages,"Checking %s for cdrom...",device);
 
   if(stat(device,&st)){

Modified: trunk/cdparanoia/main.c
===================================================================
--- trunk/cdparanoia/main.c	2006-08-29 21:40:54 UTC (rev 11810)
+++ trunk/cdparanoia/main.c	2006-08-29 22:01:52 UTC (rev 11811)
@@ -848,14 +848,10 @@
     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){
@@ -1036,6 +1032,11 @@
       paranoia_modeset(p,paranoia_mode);
       if(force_cdrom_overlap!=-1)paranoia_overlapset(p,force_cdrom_overlap);
 
+      if(verbose)
+        cdda_verbose_set(d,CDDA_MESSAGE_LOGIT,CDDA_MESSAGE_LOGIT);
+      else
+        cdda_verbose_set(d,CDDA_MESSAGE_FORGETIT,CDDA_MESSAGE_FORGETIT);
+
       paranoia_seek(p,cursor=first_sector,SEEK_SET);      
 
       /* this is probably a good idea in general */