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

[sylvain cresto]

Index: graveman/current/src/growisofs.c
diff -u graveman/current/src/growisofs.c:1.6 
graveman/current/src/growisofs.c:1.7
--- graveman/current/src/growisofs.c:1.6        Sun Feb 20 17:45:02 2005
+++ graveman/current/src/growisofs.c    Thu Mar 31 22:14:12 2005
@@ -141,7 +141,7 @@
 /* copie d'une image iso */
 gboolean burn_dvd(Tgrave *Ag, GError **Aerror) {
   gchar **Lcmd;
-  gchar *Lcommandline, *Lbufgrav, *Ltxt;
+  gchar *Lcommandline, *Ltxt;
   gchar *Lrepertoire = (gchar *)sc_grave_get_data(Ag, "tmpdir");
   gint *Lcont = (gint *) sc_grave_get_data(Ag, "cont");
   gboolean *Labort = (gboolean *) sc_grave_get_data(Ag, "gabort");
@@ -155,7 +155,7 @@
 
   gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
   GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstdvddataspeed");
-  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstdvddatacombo");
+  Tdriveinfo *Ldevice = get_drive_info(Ag, "dstdvddatacombo");
   GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Ag, "gravetitle"));
   gboolean Leject = FALSE;
   gboolean Ldosimul;
@@ -175,7 +175,6 @@
 _DEB("nbr gravure = [%d]\n", Lnbrgravure);
 
   Lbufvitesse = get_combo_value(Lvitesse);
-  Lbufgrav = get_combo_value(Lgraveur);
   Lisopara = make_image_getextrapara(Ag, "dvddata");
 
   for (Lcurcd=1; Lcurcd<= Lnbrgravure;
@@ -216,10 +215,10 @@
     gtk_label_set_text(Ltitle, Ltxt);
     g_free(Ltxt);
 
-    Lcommandline = g_strdup_printf("%s %s %s %s %s%s %s -gui 
-use-the-force-luke=tty%s %s -f %s/",
+    Lcommandline = g_strdup_printf("%s %s %s %s %s%s %s -gui 
-use-the-force-luke=tty%s %s -graft-points -path-list %s",
         conf_get_string("growisofs"), 
         Lnotfix ? "" : "-dvd-compat",
-        Loperation, Lbufgrav,
+        Loperation, get_dvdrwtools_bus(Ldevice),
         *Lbufvitesse != '0' ? "-speed=" : "", *Lbufvitesse != '0' ? 
Lbufvitesse : "",
         conf_get_boolean("overburn") ? "-overburn" : "",
         Ldosimul ? ",dummy" : "",  /* simulation ? */
@@ -235,7 +234,7 @@
       break;
     }
 
-    Lstatus = g_spawn_async_with_pipes(Lrepertoire, Lcmd, NULL, /* env 
argument */
+    Lstatus = g_spawn_async_with_pipes(NULL, Lcmd, NULL, /* env argument */
         (GSpawnFlags ) (G_SPAWN_DO_NOT_REAP_CHILD),
         NULL, NULL, Lpid, NULL, &g_out, &g_err, Aerror);
     g_strfreev(Lcmd);
@@ -271,6 +270,7 @@
     g_io_channel_unref(Lcomerr);  
     g_io_channel_shutdown(Lcom, FALSE, NULL);
     g_io_channel_unref(Lcom);
+
     g_spawn_close_pid(*Lpid);
     *Lpid = 0;
     
@@ -308,7 +308,6 @@
   }
 
   g_free(Lisopara);
-  g_free(Lbufgrav);
   g_free(Lbufvitesse);