[Graveman-cvs] Changes to graveman/current/src/cdrecord.c

[sylvain cresto]

Index: graveman/current/src/cdrecord.c
diff -u graveman/current/src/cdrecord.c:1.16 
graveman/current/src/cdrecord.c:1.17
--- graveman/current/src/cdrecord.c:1.16        Sat Feb 12 23:15:46 2005
+++ graveman/current/src/cdrecord.c     Tue Feb 15 22:44:44 2005
@@ -66,15 +66,15 @@
 
 /* definition de tous les type de bus */
 Tsearchdrive listesearchdrives[] = {
-    { "", "", "SCSI", 100 }, /* scsi (sg) */
-#ifdef LINUX_IDE  /* pure ide devices with linux */
-    { "dev=/dev/hda", "/dev/hda", "IDE", 40 },
-    { "dev=/dev/hdb", "/dev/hdb", "IDE", 40 },
-    { "dev=/dev/hdc", "/dev/hdc", "IDE", 40},
-    { "dev=/dev/hdd", "/dev/hdd", "IDE", 40 },
+#if LINUX_IDE /* pure ide devices with linux */
+    { "dev=/dev/hda", "/dev/hda", "IDE", 100 },
+    { "dev=/dev/hdb", "/dev/hdb", "IDE", 100 },
+    { "dev=/dev/hdc", "/dev/hdc", "IDE", 100 },
+    { "dev=/dev/hdd", "/dev/hdd", "IDE", 100 },
 #endif
-    { "dev=ATA:", "ATA:", "ATA", 80 }, /* ide sg */
-    { "dev=ATAPI:", "ATAPI:", "ATAPI", 60 }, /* ide */
+    { "", "", "SCSI", 80 }, /* scsi (sg) */
+    { "dev=ATA:", "ATA:", "ATA", 60 }, /* ide sg */
+    { "dev=ATAPI:", "ATAPI:", "ATAPI", 40 }, /* ide */
     { NULL, NULL, NULL, 0}
   };
 
@@ -438,7 +438,7 @@
     while (*Lcont > 0 && *Labort == FALSE) {
       gtk_main_iteration();    
     }
-    exit_prog(*Lpid, Aerror, NULL);
+    exit_prog(*Lpid, *Labort, Aerror, NULL);
 
     g_source_remove(Lcomevent);
     g_source_remove(Lcomerrevent);
@@ -817,7 +817,7 @@
     while (*Lcont>0 && *Labort == FALSE) {
       gtk_main_iteration(); 
     }
-    exit_prog(*Lpid, Aerror, NULL);
+    exit_prog(*Lpid, *Labort, Aerror, NULL);
 
     g_source_remove(Lcomerrevent);
     g_source_remove(Lcomevent);
@@ -976,7 +976,7 @@
 _DEB("fin !!!\n");
   while (*Lcont > 0) { while(gtk_events_pending()) gtk_main_iteration(); }
 
-  exit_prog(*Lpid, Aerror, NULL);
+  exit_prog(*Lpid, FALSE, Aerror, NULL);
 
   g_source_remove(Lcomerrevent);
   g_source_remove(Lcomevent);
@@ -1045,7 +1045,7 @@
 _DEB("fin !!!\n");
   while (*Lcont > 0) { while(gtk_events_pending()) gtk_main_iteration(); }
 
-  exit_prog(*Lpid, Aerror, NULL);
+  exit_prog(*Lpid, FALSE, Aerror, NULL);
 
   g_source_remove(Lcomerrevent);
   g_source_remove(Lcomevent);