[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.19 
graveman/current/src/cdrecord.c:1.20
--- graveman/current/src/cdrecord.c:1.19        Sat Feb 19 17:49:08 2005
+++ graveman/current/src/cdrecord.c     Sun Feb 20 17:45:02 2005
@@ -72,6 +72,15 @@
     { "dev=/dev/hdc", "/dev/hdc", "IDE", 100 },
     { "dev=/dev/hdd", "/dev/hdd", "IDE", 100 },
 #endif
+#if LINUX_SCSI  /* SCSI alias with linux */
+    { "dev=/dev/scd0", "/dev/scd0", "SCSI", 90 },
+    { "dev=/dev/scd1", "/dev/scd0", "SCSI", 90 },
+    { "dev=/dev/scd2", "/dev/scd0", "SCSI", 90 },
+    { "dev=/dev/scd3", "/dev/scd0", "SCSI", 90 },
+    { "dev=/dev/scd4", "/dev/scd0", "SCSI", 90 },
+    { "dev=/dev/scd5", "/dev/scd0", "SCSI", 90 },
+    { "dev=/dev/scd6", "/dev/scd0", "SCSI", 90 },
+#endif
     { "", "", "SCSI", 80 }, /* scsi (sg) */
     { "dev=ATA:", "ATA:", "ATA", 60 }, /* ide sg */
     { "dev=ATAPI:", "ATAPI:", "ATAPI", 40 }, /* ide */
@@ -91,7 +100,7 @@
     }
   } else {
     if (!Adosimul) {
-      Ltxt = g_strdup_printf(_("Writing DVD %d/%d in progress..."), Acurcd, 
Anbrgravure);
+      Ltxt = g_strdup_printf(_("Writing CD %d/%d in progress..."), Acurcd, 
Anbrgravure);
     } else {
       Ltxt = g_strdup_printf(_("Simulated CD writing %d/%d in progress..."), 
Acurcd, Anbrgravure);
     }
@@ -237,7 +246,6 @@
   gint Ltype = 0;
 
   Lcommandline = g_strdup_printf("%s -prcap dev=%s", 
conf_get_string("cdrecord"), Adev);
-  printf("==================%s\n", Lcommandline);  
 
 _DEB("==================%s\n", Lcommandline);  
   Lstatus = g_spawn_command_line_sync(Lcommandline, &Lout, &Lerr, &Lexit, 
Aerror);
@@ -302,7 +310,7 @@
 
 static gchar *get_blank_type(Tgrave *Ag)
 {
-  gboolean *Luseautoblank = (gboolean *) sc_grave_get_widget(Ag, 
"useautoblank");
+  gboolean *Luseautoblank = (gboolean *) sc_grave_get_data(Ag, "useautoblank");
 
   if (!*Luseautoblank) return g_strdup("");
 
@@ -317,20 +325,20 @@
   guint Lcomevent, Lcomerrevent;
   gint *Lcont = (gint *) sc_grave_get_data(Ag, "cont");
   gboolean *Labort = (gboolean *) sc_grave_get_data(Ag, "gabort");
-  GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_widget(Ag, "window_burn"));
+  GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_data(Ag, "window_burn"));
   gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widgetv(Ag, 
"%ssimul", Aop)));
   gint Lnbrgravure = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widgetv(Ag, "nbrcd%s", 
Aop)));  
   gboolean *Loperationstatus = (gboolean *)sc_grave_get_data(Ag, 
"operationstatus");
   gboolean Lwanteject = conf_get_boolean("eject");
-  gchar **Liso = (gchar **)sc_grave_get_data(Ag, "iso"); /* image iso */
+  gchar *Liso = (gchar *)sc_grave_get_data(Ag, "iso"); /* image iso */
   gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
   gboolean Ldosimul;
   GtkWidget *Lvitesse = sc_grave_get_widgetv(Ag, "dst%sspeed", Aop);
   GtkWidget *Lgraveur = sc_grave_get_widgetv(Ag, "dst%scombo", Aop);
-  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
+  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Ag, "gravetitle"));
   GtkToggleButton *Lbtnnotfix = GTK_TOGGLE_BUTTON(sc_grave_get_widgetv(Ag, 
"%snotfix", Aop));
   gboolean Lnotfix = Lbtnnotfix ? gtk_toggle_button_get_active(Lbtnnotfix) : 
FALSE;
-  gchar **Lextrapara = sc_grave_get_data(Ag, "extrapara");
+  gchar *Lextrapara = sc_grave_get_data(Ag, "extrapara");
   gboolean Lmulti = FALSE;
   gint *Ldone = (gint *)sc_grave_get_data(Ag, "done"); /* fais */
   gint Lcurcd;
@@ -394,10 +402,10 @@
         Lmulti ? " -multi" : "",  /* multi-session */
         Leject ? "-eject" : "", /* ejecter le cd apres l'operation */
         Lblank,
-        Lextrapara && *Lextrapara ? *Lextrapara : "",  /* parametre 
supplementaire tel que le mode d'ecriture */
+        Lextrapara && *Lextrapara ? Lextrapara : "",  /* parametre 
supplementaire tel que le mode d'ecriture */
         conf_get_boolean("overburn") ? "-overburn" : "",
         conf_get_string("cdrecordpara"),
-        *Liso);
+        Liso);
   _DEB("execution [%s]\n", Lcommandline);
 
     g_free(Lbufgrav);
@@ -438,7 +446,7 @@
     while (*Lcont > 0 && *Labort == FALSE) {
       gtk_main_iteration();    
     }
-    exit_prog(*Lpid, *Labort, Aerror, NULL);
+    exit_prog(*Lpid, FALSE, Aerror, NULL);
 
     g_source_remove(Lcomevent);
     g_source_remove(Lcomerrevent);
@@ -527,10 +535,11 @@
   gsize Llu = 0;
   gchar *Ltracknum;
 
-  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Lg, "gravetitle"));
-  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"pb_step"));
-  GtkProgressBar *LprogressbarFifo = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"pb_fifo"));
-  GtkProgressBar *LprogressbarBuffer = 
GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, "pb_buffer"));
+  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Lg, "gravetitle"));
+  GtkProgressBar *Lprogressbar = GTK_PROGRESS_BAR(sc_grave_get_data(Lg, 
"pb_total"));
+  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(sc_grave_get_data(Lg, 
"pb_step"));
+  GtkProgressBar *LprogressbarFifo = GTK_PROGRESS_BAR(sc_grave_get_data(Lg, 
"pb_fifo"));
+  GtkProgressBar *LprogressbarBuffer = GTK_PROGRESS_BAR(sc_grave_get_data(Lg, 
"pb_buffer"));
   
   /* fin du callback lorsque l'on recoi un signal comme quoi le pipe est ferme 
*/
   if (Acond == G_IO_HUP || Acond == G_IO_ERR) {
@@ -616,7 +625,7 @@
       g_strlcpy(Llasttrack, Ltracknum, _BUF_SIZE - 1);
     }
     Ltava = (1.0/ (*Ltodo)) * ((*Ldone)-1+Lpct);
-    maj_progress(Lprogressbar2, Ltava);
+    maj_progress(Lprogressbar, Ltava);
 
     /* barre fifo */
     g_snprintf(Lsbuf, sizeof(Lsbuf)-1, "%.0f%%", Lfifo);
@@ -693,11 +702,11 @@
 }
 
 gboolean gravepiste(Tgrave *Ag, GError **Aerror) {
-  GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_widget(Ag, "window_burn"));
-  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
+  GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_data(Ag, "window_burn"));
+  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Ag, "gravetitle"));
   GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstaudiospeed");
   GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstaudiocombo");
-  gchar **Lrepertoire = (gchar **)sc_grave_get_data(Ag, "tmpdir");
+  gchar *Lrepertoire = (gchar *)sc_grave_get_data(Ag, "tmpdir");
   gboolean *Loperationstatus = (gboolean *)sc_grave_get_data(Ag, 
"operationstatus");
   gboolean *Labort = (gboolean *) sc_grave_get_data(Ag, "gabort");
   gchar *Lbuftitle = NULL;
@@ -783,7 +792,7 @@
       break;
     }
 
-    Lstatus = g_spawn_async_with_pipes(*Lrepertoire, Lcmd, NULL, /* env 
argument */
+    Lstatus = g_spawn_async_with_pipes(Lrepertoire, Lcmd, NULL, /* env 
argument */
         (GSpawnFlags ) (G_SPAWN_DO_NOT_REAP_CHILD),
         NULL, NULL, Lpid, NULL, &g_out, &g_err, Aerror);
     g_strfreev(Lcmd);
@@ -812,7 +821,7 @@
     while (*Lcont>0 && *Labort == FALSE) {
       gtk_main_iteration(); 
     }
-    exit_prog(*Lpid, *Labort, Aerror, NULL);
+    exit_prog(*Lpid, FALSE, Aerror, NULL);
 
     g_source_remove(Lcomerrevent);
     g_source_remove(Lcomevent);
@@ -1015,7 +1024,6 @@
       conf_get_string("cdrecord"), Lbufgrav, (*Lfastblank == TRUE ? "fast" : 
"all"));
   g_free(Lbufgrav);
 
-  printf("execution [%s]\n", Lcommandline);
   _DEB("execution [%s]\n", Lcommandline);
   Lstatus = g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror);
   g_free(Lcommandline);