[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.7 graveman/current/src/cdrecord.c:1.8
--- graveman/current/src/cdrecord.c:1.7 Sat Jan 29 18:33:37 2005
+++ graveman/current/src/cdrecord.c     Tue Feb  1 02:35:19 2005
@@ -65,30 +65,14 @@
 /* definition de tous les type de bus */
 Tsearchdrive listesearchdrives[] = {
     { "", "", " ", 100 }, /* scsi (sg) */
-    { "dev=ATA:", "ATA:", "ATA", 80 }, /* ide sg */
-    { "dev=ATAPI:", "ATAPI:", "ATAPI", 60 }, /* ide */
 #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 },
-    { "dev=/dev/hde", "/dev/hde", "IDE", 40 },
-    { "dev=/dev/hdf", "/dev/hdf", "IDE", 40 },
-    { "dev=/dev/hdg", "/dev/hdg", "IDE", 40 },
-    { "dev=/dev/hdh", "/dev/hdh", "IDE", 40 },
-    { "dev=/dev/hdi", "/dev/hdi", "IDE", 40 },
-    { "dev=/dev/hdj", "/dev/hdj", "IDE", 40 },
-    { "dev=/dev/hdk", "/dev/hdk", "IDE", 40 },
-    { "dev=/dev/hdl", "/dev/hdl", "IDE", 40 },
-    { "dev=/dev/hdm", "/dev/hdm", "IDE", 40 },
-    { "dev=/dev/hdn", "/dev/hdn", "IDE", 40 },
-    { "dev=/dev/hdo", "/dev/hdo", "IDE", 40 },
-    { "dev=/dev/hdp", "/dev/hdp", "IDE", 40 },
-    { "dev=/dev/hdq", "/dev/hdq", "IDE", 40 },
-    { "dev=/dev/hdr", "/dev/hdr", "IDE", 40 },
-    { "dev=/dev/hds", "/dev/hds", "IDE", 40 },
-    { "dev=/dev/hdt", "/dev/hdt", "IDE", 40 },
 #endif
+    { "dev=ATA:", "ATA:", "ATA", 80 }, /* ide sg */
+    { "dev=ATAPI:", "ATAPI:", "ATAPI", 60 }, /* ide */
     { NULL, NULL, NULL, 0}
   };
 
@@ -327,6 +311,7 @@
   GIOChannel *Lcom, *Lcomerr;
   guint Lcomevent, Lcomerrevent;
   gint *Lcont = (gint *) g_hash_table_lookup(Ahash, "cont");
+  gboolean *Labort = (gboolean *) g_hash_table_lookup(Ahash, "gabort");
   GtkWindow *Lwindow = GTK_WINDOW(g_hash_table_lookup(Ahash, "window_burn"));
   gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_hash_table_lookupv(Ahash, 
"%ssimul", Aop)));
   gint Lnbrgravure = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_hash_table_lookupv(Ahash, 
"nbrcd%s", Aop)));  
@@ -374,7 +359,6 @@
       Lrep = gtk_dialog_run(GTK_DIALOG(Lconfirm));
       gtk_widget_destroy(Lconfirm);
       if (Lrep == GTK_RESPONSE_NO) {
-        gboolean *Labort = (gboolean *) g_hash_table_lookup(Ahash, "gabort");
         /* si c'est non alors on arrete */
         *Labort = TRUE;
         Lstatus = TRUE;
@@ -444,7 +428,7 @@
     Lcomerrevent = g_io_add_watch (Lcomerr, (G_IO_IN | G_IO_HUP | G_IO_ERR | 
G_IO_PRI),
                                       cdrecord_grave_callback, Ahash); 
     
-    while (*Lcont > 0) {
+    while (*Lcont > 0 && *Labort == FALSE) {
       gtk_main_iteration();    
     }
     g_source_remove(Lcomevent);
@@ -485,7 +469,6 @@
       Lrep = gtk_dialog_run(GTK_DIALOG(Lconfirm));
       gtk_widget_destroy(Lconfirm);
       if (Lrep == GTK_RESPONSE_NO) {
-        gboolean *Labort = (gboolean *) g_hash_table_lookup(Ahash, "gabort");
         /* si c'est non alors on arrete */
         *Labort = TRUE;
         Lstatus = TRUE;
@@ -704,6 +687,7 @@
   GtkWidget *Lgraveur = g_hash_table_lookup(Ahash, "dstaudiocombo");
   gchar **Lrepertoire = (gchar **)g_hash_table_lookup(Ahash, "tmpdir");
   gboolean *Loperationstatus = (gboolean *)g_hash_table_lookup(Ahash, 
"operationstatus");
+  gboolean *Labort = (gboolean *) g_hash_table_lookup(Ahash, "gabort");
   gchar *Lbuftitle = NULL;
   gchar **Lcmd;
   gchar *Lcommandline;
@@ -754,7 +738,6 @@
       Lrep = gtk_dialog_run(GTK_DIALOG(Lconfirm));
       gtk_widget_destroy(Lconfirm);
       if (Lrep == GTK_RESPONSE_NO) {
-        gboolean *Labort = (gboolean *) g_hash_table_lookup(Ahash, "gabort");
         /* si c'est non alors on arrete */
         *Labort = TRUE;
         Lstatus = TRUE;
@@ -813,7 +796,7 @@
     Lcomerrevent = g_io_add_watch (Lcomerr, (G_IO_IN | G_IO_HUP | G_IO_ERR | 
G_IO_PRI),
                                         cdrecord_grave_callback, Ahash);  
     
-    while (*Lcont>0) {
+    while (*Lcont>0 && *Labort == FALSE) {
       gtk_main_iteration(); 
     }
 
@@ -853,7 +836,6 @@
       Lrep = gtk_dialog_run(GTK_DIALOG(Lconfirm));
       gtk_widget_destroy(Lconfirm);
       if (Lrep == GTK_RESPONSE_NO) {
-        gboolean *Labort = (gboolean *) g_hash_table_lookup(Ahash, "gabort");
         /* si c'est non alors on arrete */
         *Labort = TRUE;
         Lstatus = TRUE;