[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.6 graveman/current/src/cdrdao.c:1.7
--- graveman/current/src/cdrdao.c:1.6   Fri Mar  4 01:16:38 2005
+++ graveman/current/src/cdrdao.c       Fri Mar 11 23:31:13 2005
@@ -64,11 +64,11 @@
 #define CDRDAO_NA ": n/a"
 #define CDRDAO_CD "CD"
 
-static gchar *get_blank_type(Tgrave *Ag)
+static gchar *get_blank_type(Tgrave *Ag, gint Atypemedia)
 {
   gboolean *Luseautoblank = (gboolean *) sc_grave_get_data(Ag, "useautoblank");
 
-  if (!*Luseautoblank) return g_strdup("");
+  if (!*Luseautoblank || (!(Atypemedia & _MEDIA_CDRW))) return g_strdup("");
 
   return g_strdup_printf("blank=%s", conf_get_boolean("fastblank") == TRUE ? 
"fast" : "all");
 }
@@ -87,11 +87,9 @@
   gchar *Latspeed = (gchar *) sc_grave_get_data(Lg, "atspeed"); /* vitesse 
reel operation */
   glong *Llength = (glong *) sc_grave_get_data(Lg, "length"); /* longueur 
total */
   gchar *f, *e;
-  gchar *Ltxt;
-  gchar Lsbuf[_BUF_SIZE], Lsbuf2[_BUF_SIZE];
-  gdouble Ltotaldone = 1, Ltotaltodo, Lpct, Lgbuf = 0, Ltava;
+  gchar Lsbuf[_BUF_SIZE];
+  gdouble Lpct, Ltava;
   gsize Llu = 0;
-  gchar *Ltracknum;
 
   GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Lg, "gravetitle"));
   GtkProgressBar *Lprogressbar = GTK_PROGRESS_BAR(sc_grave_get_data(Lg, 
"pb_total"));
@@ -153,7 +151,6 @@
       }
 
       if (Lok) {
-        printf("oui ok => [%.0f] => [%.0f] => [%.0f] => [%.0f]\n", Lde, La, 
Lgbuf, Lfifo);
         g_snprintf(Lsbuf, sizeof(Lsbuf)-1, _("Writing track %s - %.0f MB of 
%.0f MB at %s"),
             Llasttrack, Lde, La, Latspeed);
         gtk_label_set_text(Ltitle, Lsbuf);
@@ -275,7 +272,6 @@
 /* operation de copie d'un cd */
 gboolean copycd(Tgrave *Ag, GError **Aerror) {
   GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_data(Ag, "window_burn"));
-  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_data(Ag, "gravetitle"));
   GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstcopyspeed");
   GtkWidget *Lsource = sc_grave_get_widget(Ag, "srccopycombo");
   GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstcopycombo");
@@ -283,7 +279,6 @@
   gchar *Liso = (gchar *)sc_grave_get_data(Ag, "iso");
   gboolean *Loperationstatus = (gboolean *)sc_grave_get_data(Ag, 
"operationstatus");
   gboolean *Labort = (gboolean *) sc_grave_get_data(Ag, "gabort");
-  gchar *Lbuftitle = NULL;
   gchar **Lcmd;
   gchar *Lcommandline;
   GIOChannel *Lcom, *Lcomerr;
@@ -309,11 +304,12 @@
   gchar Latspeed[_BUF_SIZE]; /* vitesse reel de l'operation */
   gchar Llasttrack[_BUF_SIZE]; /* derniere piste traite */
   glong Llength; /* longueur total du cd */
+  gint Lmediadetect1 = _MEDIA_CDRW;
 
   Lbufvitesse = get_combo_value(Lvitesse);
   Lbufsrc = get_combo_value(Lsource);
   Lbufgrav = get_combo_value(Lgraveur);
-  Lblank = get_blank_type(Ag);
+  Lblank = get_blank_type(Ag, Lmediadetect1);
 
   *Ltodo = ((Lnbrgravure * 2 ) + (Lsimul ? 2 : 0) + (Lonfly ? Lnbrgravure : 
0));
 
@@ -322,7 +318,6 @@
   sc_grave_set_data(Ag, &Llength, "length");
   sc_grave_set_data(Ag, &Ldosimul, "simul");
   
-printf("ici super\n");
   for (Lcurcd=1; Lcurcd<= Lnbrgravure;
       ((Lsimul && Lnbrpass>1) || (!Lsimul)) ? ( Lcurcd++, Lnbrpass=1 ) : ( 
Lnbrpass++ )) { 
     *Loperationstatus = FALSE;
@@ -334,14 +329,15 @@
     if (Lcurcd > 1 && !Ldosimul) {
       /* copie sur un nouveau cd, on demande a l'utilisateur d'inserer le
        * nouveau cd vierge */
-      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 CD-R, 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) {*/
+      if (waiting_for_user("", Ag, _MEDIA_CDR + _MEDIA_APPENDABLE , 
&Lmediadetect1, Lbufgrav)==FALSE) {
         /* si c'est non alors on arrete */
         *Labort = TRUE;
         Lstatus = TRUE;
@@ -358,21 +354,21 @@
      * si il faut realiser d'autre gravure sur d'autres CD-R */
     Leject = ((Lcurcd > 1 && (Lwanteject || Lcurcd<Lnbrgravure)) || (Lcurcd == 
1 && !Ldosimul && Lwanteject));
 
-    if (Lonfly || Ldosimul || Lcurcd == 1) {
-      /* copie a la volé, ou simulation, ou cd numero 1, on n'utilise pas 
l'image sauvé
+/*    if (Lonfly || Ldosimul || Lcurcd == 1) {
+      * copie a la volé, ou simulation, ou cd numero 1, on n'utilise pas 
l'image sauvé
        * lors de la precedente operation */
       Lcommandline = g_strdup_printf("%s copy -n -v 2 %s %s %s %s%s 
--source-device %s --device %s --datafile %s %s %s",
         conf_get_string("cdrdao"), 
         Ldosimul ? " --simulate" : "",
-        Lonfly ? " --on-the-fly" : "--keepimage",
+        Lonfly ? " --on-the-fly" : "",
         Leject ? "--eject" : "",
         *Lbufvitesse == '0' ? "" : "--speed", *Lbufvitesse == '0' ? "" : 
Lbufvitesse,
         Lbufsrc, Lbufgrav, Liso,
         conf_get_boolean("overburn") ? "--overburn" : "",
         conf_get_string("cdrdaopara"));
-    } else {
+/*    } else {*/
       /* sinon on l'utilise oui ! */
-    }
+/*    } */
 
 _DEB("execution [%s]\n", Lcommandline);
     Lstatus = g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror);
@@ -481,10 +477,8 @@
 
   g_snprintf(Lcommandline, sizeof(Lcommandline)-1, "%s disk-info --device %s", 
conf_get_string("cdrdao"), Adevice);
 
-  printf("cmd %s\n", Lcommandline);
   Lstatus = g_spawn_command_line_sync(Lcommandline, &Lout, &Lerr, &Lexit, 
Aerror);
 
-printf("apres => %d\n%s\n", Lstatus, Lout);
   if (Lstatus == FALSE || Lexit != 0) {
     g_free(Lout); g_free(Lerr);
     return 0;