[xiph-commits] r15203 - trunk/cdparanoia

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2008-08-26 02:57:31 -0700 (Tue, 26 Aug 2008)
New Revision: 15203

Modified:
   trunk/cdparanoia/main.c
Log:
Report explicit full speed setting



Modified: trunk/cdparanoia/main.c
===================================================================
--- trunk/cdparanoia/main.c	2008-08-26 09:55:22 UTC (rev 15202)
+++ trunk/cdparanoia/main.c	2008-08-26 09:57:31 UTC (rev 15203)
@@ -256,8 +256,9 @@
 "  -g --force-generic-device <dev> : use specified generic scsi device and\n"
 "                                    force use of the old SG kernel\n"
 "                                    interface. -g cannot be used with -k.\n"
-"  -S --force-read-speed <n>       : read from device at specified speed; -1\n"
-"                                    indicates full speed.\n"
+"  -S --force-read-speed <n>       : read from device at specified speed; by\n"
+"                                    default, cdparanoia sets drive to full\n"
+"                                    speed.\n"
 "  -t --toc-offset <n>             : Add <n> sectors to the values reported\n"
 "                                    when addressing tracks. May be negative\n"
 "  -T --toc-bias                   : Assume that the beginning offset of \n"
@@ -1023,15 +1024,14 @@
   if(force_cdrom_speed==0)force_cdrom_speed=-1;
   if(force_cdrom_speed!=-1){
     report("\nAttempting to set speed to %dx... ",force_cdrom_speed);
+  }else{
+    report("\nAttempting to set cdrom to full speed... ");
   }
+
   if(cdda_speed_set(d,force_cdrom_speed)){
-    if(force_cdrom_speed!=-1){
-      report("\tFAILED. Continuing anyway...");
-    }
+    report("\tFAILED. Continuing anyway...");
   }else{
-    if(force_cdrom_speed!=-1){
-      report("\tdrive returned OK.");
-    }
+    report("\tdrive returned OK.");
   }
   
   if(run_cache_test)