[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.10 
graveman/current/src/growisofs.c:1.11
--- graveman/current/src/growisofs.c:1.10       Wed May  4 01:31:06 2005
+++ graveman/current/src/growisofs.c    Tue May 17 01:16:34 2005
@@ -155,7 +155,7 @@
 
   gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
   GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstdvddataspeed");
-  Tdriveinfo *Ldevice = get_drive_info(Ag, "dstdvddatacombo");
+  Tdriveinfo *Ldevice = matos_get_drive_info(Ag, "dstdvddatacombo");
   GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Ag, "gravetitle"));
   gchar *Loperation = sc_grave_get_data(Ag, "typeburn");
   gboolean Leject = FALSE;
@@ -191,7 +191,7 @@
       GtkWidget *Lconfirm;
       gint Lrep;
 
-      eject_cd(get_dvdrwtools_bus(Ldevice), NULL);
+      eject_cd(matos_get_device(Ldevice), NULL);
       Lstatus = waiting_for_user(*Lmediatitle1, Ag, Llmediarequis1 , 
&Lmediadetect1, Ldevice);
           
       if (Lstatus==FALSE) {
@@ -233,7 +233,7 @@
         conf_get_string("growisofs"), 
         Lnotfix ? "" : "-dvd-compat",
         Loperation,
-        get_dvdrwtools_bus(Ldevice),
+        matos_get_device(Ldevice),
         *Lbufvitesse != '0' ? "-speed=" : "", *Lbufvitesse != '0' ? 
Lbufvitesse : "",
         conf_get_boolean("overburn") ? "-overburn" : "",
         Ldosimul ? ",dummy" : "",  /* simulation ? */
@@ -346,7 +346,7 @@
 
   gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
   GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstdvddataspeed");
-  Tdriveinfo *Ldevice = get_drive_info(Ag, "dstdvddatacombo");
+  Tdriveinfo *Ldevice = matos_get_drive_info(Ag, "dstdvddatacombo");
   GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Ag, "gravetitle"));
   gchar *Loperation = sc_grave_get_data(Ag, "typeburn");
   gboolean Leject = FALSE;
@@ -382,7 +382,7 @@
       GtkWidget *Lconfirm;
       gint Lrep;
 
-      eject_cd(get_dvdrwtools_bus(Ldevice), NULL);
+      eject_cd(matos_get_device(Ldevice), NULL);
       Lstatus = waiting_for_user(*Lmediatitle1, Ag, Llmediarequis1 , 
&Lmediadetect1, Ldevice);
           
       if (Lstatus==FALSE) {
@@ -424,7 +424,7 @@
         conf_get_string("growisofs"), 
         Lnotfix ? "" : "-dvd-compat",
         Loperation,
-        get_dvdrwtools_bus(Ldevice),
+        matos_get_device(Ldevice),
         *Lbufvitesse != '0' ? "-speed=" : "", *Lbufvitesse != '0' ? 
Lbufvitesse : "",
         conf_get_boolean("overburn") ? "-overburn" : "",
         Ldosimul ? ",dummy" : "",  /* simulation ? */
@@ -440,6 +440,9 @@
       break;
     }
 
+    /* try to umount device before device access */
+    matos_umount_device(Ldevice, NULL);
+
     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);