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

[sylvain cresto]

Index: graveman/current/src/cdrdao.c
diff -u graveman/current/src/cdrdao.c:1.9 graveman/current/src/cdrdao.c:1.10
--- graveman/current/src/cdrdao.c:1.9   Sun Mar 27 23:51:07 2005
+++ graveman/current/src/cdrdao.c       Tue Mar 29 00:10:26 2005
@@ -273,8 +273,8 @@
 gboolean copycd(Tgrave *Ag, GError **Aerror) {
   GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_data(Ag, "window_burn"));
   GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstcopyspeed");
-  GtkWidget *Lsource = sc_grave_get_widget(Ag, "srccopycombo");
-  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstcopycombo");
+  Tdriveinfo *Lsource = get_drive_info(Ag, "srccopycombo");
+  Tdriveinfo *Lgraveur = get_drive_info(Ag, "dstcopycombo");
   gchar *Lrepertoire = (gchar *)sc_grave_get_data(Ag, "tmpdir");
   gchar *Liso = (gchar *)sc_grave_get_data(Ag, "iso");
   gboolean *Loperationstatus = (gboolean *)sc_grave_get_data(Ag, 
"operationstatus");
@@ -291,7 +291,7 @@
   
   gint g_out, g_err, Lnbrarg;
   gboolean Lstatus = FALSE;
-  gchar *Lbufvitesse, *Lbufgrav, *Lbufsrc;
+  gchar *Lbufvitesse;
   gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"copysimul")));
   gboolean Lonfly = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"copyonfly")));
   gint Lnbrgravure = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widget(Ag, 
"nbrcdcopy")));
@@ -307,8 +307,6 @@
   gint Lmediadetect1 = _MEDIA_CDRW;
 
   Lbufvitesse = get_combo_value(Lvitesse);
-  Lbufsrc = get_combo_value(Lsource);
-  Lbufgrav = get_combo_value(Lgraveur);
   Lblank = get_blank_type(Ag, Lmediadetect1);
 
   *Ltodo = ((Lnbrgravure * 2 ) + (Lsimul ? 2 : 0) + (Lonfly ? Lnbrgravure : 
0));
@@ -341,7 +339,7 @@
       Lrep = gtk_dialog_run(GTK_DIALOG(Lconfirm));
       gtk_widget_destroy(Lconfirm);
       if (Lrep == GTK_RESPONSE_NO) {*/
-      Lstatus = waiting_for_user(_MEDIA_BLANKORAPPENDABLE, Ag, Llmediarequis, 
&Lmediadetect1, Lbufgrav);
+      Lstatus = waiting_for_user(_MEDIA_BLANKORAPPENDABLE, Ag, Llmediarequis, 
&Lmediadetect1, Lgraveur);
       g_slist_free(Llmediarequis);
 
       if (Lstatus==FALSE) {
@@ -369,7 +367,7 @@
         Lonfly ? " --on-the-fly" : "",
         Leject ? "--eject" : "",
         *Lbufvitesse == '0' ? "" : "--speed", *Lbufvitesse == '0' ? "" : 
Lbufvitesse,
-        Lbufsrc, Lbufgrav, Liso,
+        DRIVE_DEV(Lsource), DRIVE_DEV(Lgraveur), Liso,
         conf_get_boolean("overburn") ? "--overburn" : "",
         conf_get_string("cdrdaopara"));
 /*    } else {*/
@@ -458,7 +456,6 @@
   }
 
   g_free(Lblank);
-  g_free(Lbufgrav);
   g_free(Lbufvitesse);
 
   sc_grave_del_data(Ag, "simul");
@@ -471,7 +468,7 @@
 
 
 /* retourne les infos sur le media inseré dans le lecteur */
-gint get_cdinfo(Tgrave *Ag, gchar *Adevice, GError **Aerror)
+gint get_cdinfo(Tgrave *Ag, Tdriveinfo *Adevice, GError **Aerror)
 {
   gchar Lcommandline[_BUF_SIZE];
   gboolean Lstatus;
@@ -486,7 +483,8 @@
   gint *Lpid = (gint *)sc_grave_get_data(Ag, "pid");
   GString *Loutput;
 
-  g_snprintf(Lcommandline, sizeof(Lcommandline)-1, "%s disk-info --device %s", 
conf_get_string("cdrdao"), Adevice);
+  g_snprintf(Lcommandline, sizeof(Lcommandline)-1, "%s disk-info --device %s", 
conf_get_string("cdrdao"), DRIVE_DEV(Adevice));
+_DEB("execution de [%s]\n", Lcommandline);
   if (!g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror)) return 0;
 
 
@@ -511,6 +509,7 @@
   while (Lloccont > 0) {
     gtk_main_iteration();
   }
+  exit_prog(*Lpid, FALSE, Aerror, NULL);
 
   g_source_remove(Lcomevent);