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

[sylvain cresto]

Index: graveman/current/src/mkisofs.c
diff -u graveman/current/src/mkisofs.c:1.10 graveman/current/src/mkisofs.c:1.11
--- graveman/current/src/mkisofs.c:1.10 Sun Feb 20 17:45:02 2005
+++ graveman/current/src/mkisofs.c      Mon Feb 21 01:25:28 2005
@@ -33,6 +33,8 @@
 #define MKISOFS_NOSPACE "No space left on device"
 #define MKISOFS_SUPPORT_ISOV2 "Set ISO9660 conformance level (1..3) or 4 for 
ISO9660 version 2"
 
+
+
 /* on verifie si le support iso9660 version 2 est disponnible ou non */
 gboolean check_mkisofs()
 {
@@ -75,8 +77,17 @@
     gboolean Lrockridge = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datarockridge")));
     gboolean Ljoliet = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datajoliet")));
     gchar *Lisolevel = get_combo_value(sc_grave_get_widget(Ag, 
"dataisolevel"));
+    gchar *Lmediainfo = NULL;
+    gchar *Lcombo = NULL;
+
+    if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datamulti")))) {
+      Lcombo = get_combo_value(sc_grave_get_widget(Ag, "dstdatacombo"));
+      Lmediainfo = cdrecord_get_mediainfo(Ag, Lcombo, NULL);
+    }
 
-    Lextra = g_strdup_printf("%s %s -iso-level %s", Lrockridge == TRUE ? "-r" 
: "", Ljoliet ? "-J" : "", Lisolevel);
+    Lextra = g_strdup_printf("%s %s -iso-level %s %s%s %s%s", Lrockridge == 
TRUE ? "-r" : "", Ljoliet ? "-J" : "", Lisolevel,
+        Lmediainfo ? "-C " : "", Lmediainfo ? Lmediainfo : "", Lcombo ? "-M " 
: "", Lcombo ? Lcombo : "");
+    g_free(Lmediainfo);
     g_free(Lisolevel);
   } else {  /* data dvd */
     Lextra = g_strdup("-R -J");
@@ -121,7 +132,6 @@
     /* avancement tache */
     Lpct = 0.01 * atof(f);
     gtk_progress_bar_set_fraction(Lprogressbar2, Lpct);
-    g_snprintf(Lsbuf, sizeof(Lsbuf)-1, "%s%%", f);
     gtk_progress_bar_set_text(Lprogressbar2, Lsbuf);
     /* avancement total */
     Ltava = (1.0 / (*Ltodo)) * ((*Ldone)-1+Lpct);