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

[sylvain cresto]

Index: graveman/current/src/cdrecord.c
diff -u graveman/current/src/cdrecord.c:1.17 
graveman/current/src/cdrecord.c:1.18
--- graveman/current/src/cdrecord.c:1.17        Tue Feb 15 22:44:44 2005
+++ graveman/current/src/cdrecord.c     Thu Feb 17 01:22:53 2005
@@ -300,7 +300,7 @@
   return Lreturn;
 }
 
-gchar *get_blank_type(GHashTable *Ahash)
+static gchar *get_blank_type(GHashTable *Ahash)
 {
   gboolean *Luseautoblank = (gboolean *) g_hash_table_lookup(Ahash, 
"useautoblank");
 
@@ -609,9 +609,7 @@
     /* barres de progression */
     /* avancement operation */
     Lpct = (1.0/Ltotaltodo) * Ltotaldone;
-    gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(Lprogressbar2), Lpct);
-    g_snprintf(Lsbuf2, sizeof(Lsbuf2)-1, "%.0f%%", Lpct*100);
-    gtk_progress_bar_set_text(GTK_PROGRESS_BAR(Lprogressbar2), Lsbuf2);
+    maj_progress(Lprogressbar2, Lpct);
 
     /* avancement total */
     if (*Ltracknum && (!*Llasttrack || strcmp(Llasttrack, Ltracknum))) {
@@ -619,9 +617,7 @@
       g_strlcpy(Llasttrack, Ltracknum, _BUF_SIZE - 1);
     }
     Ltava = (1.0/ (*Ltodo)) * ((*Ldone)-1+Lpct);
-    gtk_progress_bar_set_fraction(Lprogressbar, Ltava);
-    g_snprintf(Lsbuf2, sizeof(Lsbuf2)-1, "%.0f%%", Ltava*100);
-    gtk_progress_bar_set_text(Lprogressbar, Lsbuf2);
+    maj_progress(Lprogressbar2, Ltava);
 
     /* barre fifo */
     g_snprintf(Lsbuf, sizeof(Lsbuf)-1, "%.0f%%", Lfifo);
@@ -873,7 +869,7 @@
   return Lstatus;
 }
 
-gboolean cdrecord_blankorfix_callback(GIOChannel *Astd, GIOCondition Acond, 
gpointer Adata)
+gboolean common_blankorfix_callback(GIOChannel *Astd, GIOCondition Acond, 
gpointer Adata)
 {
   GIOStatus Lstatus;
   GHashTable *Lhash = (GHashTable *)Adata;
@@ -918,9 +914,8 @@
   return TRUE;
 }
 
-
-/* effacer un cdrw */
-gboolean perform_erase_cdrw(GHashTable *Ahash, GError **Aerror)
+/* cloturer un cdr*/
+gboolean perform_fix_cd(GHashTable *Ahash, GError **Aerror)
 {
   gchar **Lcmd;
   gchar *Lcommandline, *Lbufgrav;
@@ -930,17 +925,14 @@
   gint g_out, g_err, Lnbrarg;
   gint *Lcont = g_hash_table_lookup(Ahash, "cont");
   GtkWidget *Lgraveur = g_hash_table_lookup(Ahash, "dstothercombo");
-  gboolean *Lfastblank = g_hash_table_lookup(Ahash, "usefastblank");
 
   /* pid de cdrecord */
   gint *Lpid = (gint *) g_hash_table_lookup(Ahash, "pid");
 
   Lbufgrav = get_combo_value(Lgraveur);
-  Lcommandline = g_strdup_printf("%s dev=%s -v gracetime=2 blank=%s",
-      conf_get_string("cdrecord"), Lbufgrav, (*Lfastblank == TRUE ? "fast" : 
"all"));
+  Lcommandline = g_strdup_printf("%s dev=%s -v -fix", 
conf_get_string("cdrecord"), Lbufgrav);
   g_free(Lbufgrav);
 
-  printf("execution [%s]\n", Lcommandline);
   _DEB("execution [%s]\n", Lcommandline);
   Lstatus = g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror);
   g_free(Lcommandline);
@@ -962,13 +954,13 @@
   g_io_channel_set_encoding (Lcom, NULL, NULL);
   g_io_channel_set_flags( Lcom, G_IO_FLAG_NONBLOCK, NULL );
   Lcomevent = g_io_add_watch (Lcom, (G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI),
-                                      cdrecord_blankorfix_callback, Ahash);
+                                      common_blankorfix_callback, Ahash);
   
   Lcomerr = g_io_channel_unix_new( g_err );
   g_io_channel_set_encoding (Lcomerr, NULL, NULL);
   g_io_channel_set_flags( Lcomerr, G_IO_FLAG_NONBLOCK, NULL );
   Lcomerrevent = g_io_add_watch (Lcomerr, (G_IO_IN | G_IO_HUP | G_IO_ERR | 
G_IO_PRI),
-                                      cdrecord_blankorfix_callback, Ahash);  
+                                      common_blankorfix_callback, Ahash);  
 _DEB("cont vaut => %d\n", *Lcont);
   while (*Lcont > 1) {
     gtk_main_iteration(); 
@@ -991,8 +983,20 @@
   return *Aerror ? FALSE : TRUE;
 }
 
-/* clotuer un cdr*/
-gboolean perform_fix_cd(GHashTable *Ahash, GError **Aerror)
+
+/* ejecter un CD */
+void eject_cd(gchar *Adev, GError **Aerror)
+{
+  gchar *Lcommandline = g_strdup_printf("%s -eject dev=%s", 
conf_get_string("cdrecord"), Adev);
+  _DEB("EJECT %s\n", Adev);
+  
+  g_spawn_command_line_sync(Lcommandline, NULL, NULL, NULL, Aerror);
+
+  g_free(Lcommandline);
+}
+
+/* effacer un cdrw */
+gboolean perform_erase_cdrw(GHashTable *Ahash, GError **Aerror)
 {
   gchar **Lcmd;
   gchar *Lcommandline, *Lbufgrav;
@@ -1002,14 +1006,17 @@
   gint g_out, g_err, Lnbrarg;
   gint *Lcont = g_hash_table_lookup(Ahash, "cont");
   GtkWidget *Lgraveur = g_hash_table_lookup(Ahash, "dstothercombo");
+  gboolean *Lfastblank = g_hash_table_lookup(Ahash, "usefastblank");
 
   /* pid de cdrecord */
   gint *Lpid = (gint *) g_hash_table_lookup(Ahash, "pid");
 
   Lbufgrav = get_combo_value(Lgraveur);
-  Lcommandline = g_strdup_printf("%s dev=%s -v -fix", 
conf_get_string("cdrecord"), Lbufgrav);
+  Lcommandline = g_strdup_printf("%s dev=%s -v gracetime=2 blank=%s",
+      conf_get_string("cdrecord"), Lbufgrav, (*Lfastblank == TRUE ? "fast" : 
"all"));
   g_free(Lbufgrav);
 
+  printf("execution [%s]\n", Lcommandline);
   _DEB("execution [%s]\n", Lcommandline);
   Lstatus = g_shell_parse_argv(Lcommandline, &Lnbrarg, &Lcmd, Aerror);
   g_free(Lcommandline);
@@ -1031,13 +1038,13 @@
   g_io_channel_set_encoding (Lcom, NULL, NULL);
   g_io_channel_set_flags( Lcom, G_IO_FLAG_NONBLOCK, NULL );
   Lcomevent = g_io_add_watch (Lcom, (G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI),
-                                      cdrecord_blankorfix_callback, Ahash);
+                                      common_blankorfix_callback, Ahash);
   
   Lcomerr = g_io_channel_unix_new( g_err );
   g_io_channel_set_encoding (Lcomerr, NULL, NULL);
   g_io_channel_set_flags( Lcomerr, G_IO_FLAG_NONBLOCK, NULL );
   Lcomerrevent = g_io_add_watch (Lcomerr, (G_IO_IN | G_IO_HUP | G_IO_ERR | 
G_IO_PRI),
-                                      cdrecord_blankorfix_callback, Ahash);  
+                                      common_blankorfix_callback, Ahash);  
 _DEB("cont vaut => %d\n", *Lcont);
   while (*Lcont > 1) {
     gtk_main_iteration(); 
@@ -1061,16 +1068,6 @@
 }
 
 
-/* ejecter un CD */
-void eject_cd(gchar *Adev, GError **Aerror)
-{
-  gchar *Lcommandline = g_strdup_printf("%s -eject dev=%s", 
conf_get_string("cdrecord"), Adev);
-  _DEB("EJECT %s\n", Adev);
-  
-  g_spawn_command_line_sync(Lcommandline, NULL, NULL, NULL, Aerror);
-
-  g_free(Lcommandline);
-}
 
 /*
  * vim:et:ts=8:sts=2:sw=2