[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.26 
graveman/current/src/cdrecord.c:1.27
--- graveman/current/src/cdrecord.c:1.26        Tue Mar 29 00:10:26 2005
+++ graveman/current/src/cdrecord.c     Thu Mar 31 22:14:12 2005
@@ -427,7 +427,7 @@
     g_free(Ltxt);
 
     Lblank = get_blank_type(Ag, Lmediadetect1);
-    Lcommandline = g_strdup_printf("%s dev=%s -v gracetime=2 %s%s %s %s %s %s 
%s %s %s %s '%s' driveropts=burnfree",
+    Lcommandline = g_strdup_printf("%s dev=%s -v gracetime=2 %s%s %s %s %s %s 
%s %s %s %s '%s' %s",
         conf_get_string("cdrecord"), DRIVE_DEV(Ldevice),
         *Lbufvitesse != '0' ? "speed=" : "", *Lbufvitesse != '0' ? Lbufvitesse 
: "",  
         Ldosimul ? " -dummy" : "",  /* simulation ? */
@@ -438,7 +438,9 @@
         Lextrapara && *Lextrapara ? Lextrapara : "",  /* parametre 
supplementaire tel que le mode d'ecriture */
         conf_get_boolean("overburn") ? "-overburn" : "",
         conf_get_string("cdrecordpara"),
-        Liso);
+        Liso,
+        DRIVE_BURN_FREE(Ldevice) ? "driveropts=burnfree" : ""
+        );
     g_free(Lblank);
   
   _DEB("execution [%s]\n", Lcommandline);
@@ -814,7 +816,7 @@
     Leject = ((Lcurcd > 1 && (Lwanteject || Lcurcd<Lnbrgravure)) || (Lcurcd == 
1 && !Ldosimul && Lwanteject));
 
     Lblank = get_blank_type(Ag, Lmediadetect1);
-    Lcommandline = g_strdup_printf("%s dev=%s -v gracetime=2 %s%s %s%s %s %s 
%s %s %s -pad -audio %s driveropts=burnfree", 
+    Lcommandline = g_strdup_printf("%s dev=%s -v gracetime=2 %s%s %s%s %s %s 
%s %s %s -pad -audio %s %s",
         conf_get_string("cdrecord"), DRIVE_DEV(Ldevice),
         *Lbufvitesse == '0' ? "" : "speed=", *Lbufvitesse == '0' ? "" : 
Lbufvitesse,
         Ldosimul ? " -dummy" : "",  /* simulation ? */ 
@@ -826,7 +828,9 @@
                                                 * a été faite juste avant */
         conf_get_string("cdrecordpara"),
         conf_get_boolean("overburn") ? "-overburn" : "",
-        Lfileslist);
+        Lfileslist,
+        DRIVE_BURN_FREE(Ldevice) ? "driveropts=burnfree" : ""
+        );
     g_free(Lblank);
 _DEB("execution [%s]\n", Lcommandline);
     Lstatus = g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror);
@@ -967,20 +971,18 @@
 gboolean perform_fix_cd(Tgrave *Ag, GError **Aerror)
 {
   gchar **Lcmd;
-  gchar *Lcommandline, *Lbufgrav;
+  gchar *Lcommandline;
   gboolean Lstatus = FALSE;
   GIOChannel *Lcom, *Lcomerr;
   guint Lcomevent, Lcomerrevent;
   gint g_out, g_err, Lnbrarg;
   gint *Lcont = sc_grave_get_data(Ag, "cont");
-  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstothercombo");
+  Tdriveinfo *Ldevice = get_drive_info(Ag, "dstothercombo");
 
   /* pid de cdrecord */
   gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
 
-  Lbufgrav = get_combo_value(Lgraveur);
-  Lcommandline = g_strdup_printf("%s dev=%s -v -fix", 
conf_get_string("cdrecord"), Lbufgrav);
-  g_free(Lbufgrav);
+  Lcommandline = g_strdup_printf("%s dev=%s -v -fix", 
conf_get_string("cdrecord"), DRIVE_DEV(Ldevice));
 
   _DEB("execution [%s]\n", Lcommandline);
   Lstatus = g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror);
@@ -1048,22 +1050,20 @@
 gboolean perform_erase_cdrw(Tgrave *Ag, GError **Aerror)
 {
   gchar **Lcmd;
-  gchar *Lcommandline, *Lbufgrav;
+  gchar *Lcommandline;
   gboolean Lstatus = FALSE;
   GIOChannel *Lcom, *Lcomerr;
   guint Lcomevent, Lcomerrevent;
   gint g_out, g_err, Lnbrarg;
   gint *Lcont = sc_grave_get_data(Ag, "cont");
-  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstothercombo");
+  Tdriveinfo *Ldevice = get_drive_info(Ag, "dstothercombo");
   gboolean *Lfastblank = sc_grave_get_data(Ag, "usefastblank");
 
   /* pid de cdrecord */
   gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
 
-  Lbufgrav = get_combo_value(Lgraveur);
   Lcommandline = g_strdup_printf("%s dev=%s -v gracetime=2 blank=%s",
-      conf_get_string("cdrecord"), Lbufgrav, (*Lfastblank == TRUE ? "fast" : 
"all"));
-  g_free(Lbufgrav);
+      conf_get_string("cdrecord"), DRIVE_DEV(Ldevice), (*Lfastblank == TRUE ? 
"fast" : "all"));
 
   _DEB("execution [%s]\n", Lcommandline);
   Lstatus = g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror);
@@ -1183,16 +1183,12 @@
   sc_grave_set_data(Ag, &Lmsinfo, "msinfo");
   
   Lcommandline = g_strdup_printf("%s dev=%s -msinfo", 
conf_get_string("cdrecord"), Adevice);
-printf("???\n");
 _DEB("1execution [%s]", Lcommandline);
-printf("???\n");
   Lstatus = g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror);
-  printf("youpi c'est la teuf !\n");
   g_free(Lcommandline);
   if (Lstatus != FALSE) { 
     *Lcont = 2;
 
-  printf("youpi c'est la teuf 2!\n");
     Lstatus = g_spawn_async_with_pipes(NULL, Lcmd, NULL, (GSpawnFlags) 
(G_SPAWN_DO_NOT_REAP_CHILD),
         NULL, NULL, Lpid, NULL, &g_out, &g_err, Aerror);
 
@@ -1216,12 +1212,10 @@
 
   sc_grave_del_data(Ag, "msinfo");
 
-  printf("youpi c'est la teuf 3!\n");
   /* attente de la fin du timeout */ 
   g_source_remove(Ltimeout);
   sc_chomp(Lmsinfo);
   _DEB("msinfo = [%s]\n", Lmsinfo);
-  printf("msinfo = [%s]\n", Lmsinfo);
 
   return *Lmsinfo ? g_strdup(Lmsinfo) : NULL;
 }