[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.7 
graveman/current/src/growisofs.c:1.8
--- graveman/current/src/growisofs.c:1.7        Thu Mar 31 22:14:12 2005
+++ graveman/current/src/growisofs.c    Mon Apr  4 01:37:42 2005
@@ -157,10 +157,10 @@
   GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstdvddataspeed");
   Tdriveinfo *Ldevice = 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;
   gboolean Ldosimul;
   gchar *Lbufvitesse;
-  gchar *Loperation = sc_grave_get_data(Ag, "typeburn");
   gint Lcurcd;
   gint Lnbrpass=1;
   gint g_out, g_err, Lnbrarg;
@@ -168,7 +168,7 @@
   GIOChannel *Lcom, *Lcomerr;
   gchar *Lisopara = NULL;
   gboolean Lstatus;
-
+  gint Lmediadetect1 = _MEDIA_CDRW;
   GtkToggleButton *Lbtnnotfix = GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"dvddatanotfix"));
   gboolean Lnotfix = Lbtnnotfix ? gtk_toggle_button_get_active(Lbtnnotfix) : 
FALSE;
 _DEB("DVD DATA\n");
@@ -184,20 +184,49 @@
     if (Lcurcd > 1 && !Ldosimul) {
       /* copie sur un nouveau dvd, on demande a l'utilisateur d'inserer le
        * nouveau dvdvierge */
-      gint Lrep;
+/*      gint Lrep;
       GtkWidget *Lconfirm = gtk_message_dialog_new(Lwindow,
                                               GTK_DIALOG_MODAL, 
GTK_MESSAGE_QUESTION,
                                               GTK_BUTTONS_YES_NO,
                  _("Now you should insert next DVD-RW/DVD+RW, do you want to 
continue operation ?"));
       Lrep = gtk_dialog_run(GTK_DIALOG(Lconfirm));
       gtk_widget_destroy(Lconfirm);
-      if (Lrep == GTK_RESPONSE_NO) {
+      if (Lrep == GTK_RESPONSE_NO) {*/
         /* si c'est non alors on arrete */
-        *Labort = TRUE;
+/*        *Labort = TRUE;
         Lstatus = TRUE;
         break;
+      }*/
+      GSList *Llmediarequis1 = sc_grave_get_data(Ag, "mediarequis1");
+      gint *Lmediatitle1 = sc_grave_get_data(Ag, "mediatitle1");
+      gboolean Lstatus;
+      Tgrave *Ldialoghash;
+      GtkWidget *Lconfirm;
+      gint Lrep;
+
+      eject_cd(get_dvdrwtools_bus(Ldevice), NULL);
+      Lstatus = waiting_for_user(*Lmediatitle1, Ag, Llmediarequis1 , 
&Lmediadetect1, Ldevice);
+          
+      if (Lstatus==FALSE) {
+        /* si c'est non alors on arrete */
+        *Labort = TRUE; Lstatus = TRUE; break;
+      } 
+      
+      Ldialoghash = create_dialog_select_dvdoperation(GTK_WIDGET(Lwindow), 
Lmediadetect1);
+      Lconfirm = sc_grave_get_data(Ldialoghash, "window");
+      Lrep = gtk_dialog_run(GTK_DIALOG(Lconfirm));
+
+      if (Lrep != GTK_RESPONSE_YES) {
+        /* si c'est non alors on arrete */
+        *Labort = TRUE; Lstatus = TRUE;
+      } else {
+        GtkRadioButton *Labradio = 
GTK_RADIO_BUTTON(sc_grave_get_widget(Ldialoghash, "burninitial"));
+        g_free(Loperation);
+        Loperation = 
g_strdup(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(Labradio)) ? "-Z" : 
"-M");
       }
+      gtk_widget_destroy(Lconfirm);
 
+      if (*Labort == TRUE) break;
     }
 
 
@@ -218,7 +247,8 @@
     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, get_dvdrwtools_bus(Ldevice),
+        Loperation,
+        get_dvdrwtools_bus(Ldevice),
         *Lbufvitesse != '0' ? "-speed=" : "", *Lbufvitesse != '0' ? 
Lbufvitesse : "",
         conf_get_boolean("overburn") ? "-overburn" : "",
         Ldosimul ? ",dummy" : "",  /* simulation ? */