[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.18 
graveman/current/src/cdrecord.c:1.19
--- graveman/current/src/cdrecord.c:1.18        Thu Feb 17 01:22:53 2005
+++ graveman/current/src/cdrecord.c     Sat Feb 19 17:49:08 2005
@@ -137,9 +137,9 @@
 gboolean scan_callback(GIOChannel *Astd, GIOCondition Acond, gpointer Adata)
 {
   GIOStatus Lstatus;
-  GHashTable *Lhash = (GHashTable *)Adata;
-  gint *Lcont = (gint *)g_hash_table_lookup(Lhash, "cont");
-  Tsearchdrive *Ldrivedesc = (Tsearchdrive *)g_hash_table_lookup(Lhash, 
"drivedesc");
+  Tgrave *Lg = (Tgrave *)Adata;
+  gint *Lcont = (gint *)sc_grave_get_data(Lg, "cont");
+  Tsearchdrive *Ldrivedesc = (Tsearchdrive *)sc_grave_get_data(Lg, 
"drivedesc");
   gchar *Lbuffer = NULL;
   gchar *Lmodel, *Lmarque, *Ldev, *Lquoi;
   
@@ -172,7 +172,7 @@
 }
 
 /* scan des lecteurs */
-gboolean scan_for_drives(GHashTable *Ahash, GError **Aerror)
+gboolean scan_for_drives(Tgrave *Ag, GError **Aerror)
 {
   gchar **Lcmd;
   gchar *Lcommandline;
@@ -182,8 +182,8 @@
   gboolean Lstatus;
   guint Lcomevent;
   Tsearchdrive *Lcurentry;
-  gint *Lcont = (gint *)g_hash_table_lookup(Ahash, "cont");
-  gboolean *Labort = (gboolean *)g_hash_table_lookup(Ahash, "gabort");
+  gint *Lcont = (gint *)sc_grave_get_data(Ag, "cont");
+  gboolean *Labort = (gboolean *)sc_grave_get_data(Ag, "gabort");
   
   free_drives(FALSE);
 
@@ -195,7 +195,7 @@
     if (Lstatus == FALSE) return FALSE;
 
     *Lcont = 3;
-    g_hash_table_insert(Ahash, "drivedesc", Lcurentry);
+    sc_grave_set_data(Ag, Lcurentry, "drivedesc");
 
     Lbolstatus = g_spawn_async_with_pipes(NULL, Lcmd, NULL, /* env argument */
       (GSpawnFlags ) (0),
@@ -212,7 +212,7 @@
     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),
                                             scan_callback,
-                                            Ahash); 
+                                            Ag); 
     while (*Lcont==3) {
       gtk_main_iteration();    
     }
@@ -222,7 +222,7 @@
     g_io_channel_shutdown(Lcom, FALSE, NULL);
     g_io_channel_unref(Lcom);
     g_spawn_close_pid(Lpid);
-    g_hash_table_remove(Ahash, "drivedesc");
+    sc_grave_del_data(Ag, "drivedesc");
   }
 
   return TRUE;
@@ -287,10 +287,10 @@
 }
 
 /* recherche les parametres supllementaires a passer a cdrecord */
-gchar *burn_data_getextrapara(GHashTable *Ahash)
+gchar *burn_data_getextrapara(Tgrave *Ag)
 {
-  gchar *Lformat = get_combo_value(g_hash_table_lookup(Ahash, "dataformat"));
-  gchar *Lmodburn = get_combo_value(g_hash_table_lookup(Ahash, "datamodburn"));
+  gchar *Lformat = get_combo_value(sc_grave_get_widget(Ag, "dataformat"));
+  gchar *Lmodburn = get_combo_value(sc_grave_get_widget(Ag, "datamodburn"));
   gchar *Lreturn;
 
   Lreturn = g_strdup_printf("-%s -%s", Lformat, Lmodburn);
@@ -300,9 +300,9 @@
   return Lreturn;
 }
 
-static gchar *get_blank_type(GHashTable *Ahash)
+static gchar *get_blank_type(Tgrave *Ag)
 {
-  gboolean *Luseautoblank = (gboolean *) g_hash_table_lookup(Ahash, 
"useautoblank");
+  gboolean *Luseautoblank = (gboolean *) sc_grave_get_widget(Ag, 
"useautoblank");
 
   if (!*Luseautoblank) return g_strdup("");
 
@@ -310,29 +310,29 @@
 }
 
 /* copie d'une image iso */
-gboolean burn_from_image(gchar *Aop, GHashTable *Ahash, GError **Aerror) {
+gboolean burn_from_image(gchar *Aop, Tgrave *Ag, GError **Aerror) {
   gchar **Lcmd;
   gchar *Lcommandline, *Lbufgrav, *Ltxt;
   GIOChannel *Lcom, *Lcomerr;
   guint Lcomevent, Lcomerrevent;
-  gint *Lcont = (gint *) g_hash_table_lookup(Ahash, "cont");
-  gboolean *Labort = (gboolean *) g_hash_table_lookup(Ahash, "gabort");
-  GtkWindow *Lwindow = GTK_WINDOW(g_hash_table_lookup(Ahash, "window_burn"));
-  gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_hash_table_lookupv(Ahash, 
"%ssimul", Aop)));
-  gint Lnbrgravure = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_hash_table_lookupv(Ahash, 
"nbrcd%s", Aop)));  
-  gboolean *Loperationstatus = (gboolean *)g_hash_table_lookup(Ahash, 
"operationstatus");
+  gint *Lcont = (gint *) sc_grave_get_data(Ag, "cont");
+  gboolean *Labort = (gboolean *) sc_grave_get_data(Ag, "gabort");
+  GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_widget(Ag, "window_burn"));
+  gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widgetv(Ag, 
"%ssimul", Aop)));
+  gint Lnbrgravure = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widgetv(Ag, "nbrcd%s", 
Aop)));  
+  gboolean *Loperationstatus = (gboolean *)sc_grave_get_data(Ag, 
"operationstatus");
   gboolean Lwanteject = conf_get_boolean("eject");
-  gchar **Liso = (gchar **)g_hash_table_lookup(Ahash, "iso"); /* image iso */
-  gint *Lpid = (gint *) g_hash_table_lookup(Ahash, "pid");
+  gchar **Liso = (gchar **)sc_grave_get_data(Ag, "iso"); /* image iso */
+  gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
   gboolean Ldosimul;
-  GtkWidget *Lvitesse = sc_hash_table_lookupv(Ahash, "dst%sspeed", Aop);
-  GtkWidget *Lgraveur = sc_hash_table_lookupv(Ahash, "dst%scombo", Aop);
-  GtkLabel *Ltitle = GTK_LABEL(g_hash_table_lookup(Ahash, "gravetitle"));
-  GtkToggleButton *Lbtnnotfix = GTK_TOGGLE_BUTTON(sc_hash_table_lookupv(Ahash, 
"%snotfix", Aop));
+  GtkWidget *Lvitesse = sc_grave_get_widgetv(Ag, "dst%sspeed", Aop);
+  GtkWidget *Lgraveur = sc_grave_get_widgetv(Ag, "dst%scombo", Aop);
+  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
+  GtkToggleButton *Lbtnnotfix = GTK_TOGGLE_BUTTON(sc_grave_get_widgetv(Ag, 
"%snotfix", Aop));
   gboolean Lnotfix = Lbtnnotfix ? gtk_toggle_button_get_active(Lbtnnotfix) : 
FALSE;
-  gchar **Lextrapara = g_hash_table_lookup(Ahash, "extrapara");
+  gchar **Lextrapara = sc_grave_get_data(Ag, "extrapara");
   gboolean Lmulti = FALSE;
-  gint *Ldone = (gint *)g_hash_table_lookup(Ahash, "done"); /* fais */
+  gint *Ldone = (gint *)sc_grave_get_data(Ag, "done"); /* fais */
   gint Lcurcd;
   gint Lnbrpass=1;
   gchar *Lbufvitesse, *Lblank;
@@ -342,9 +342,9 @@
   gboolean Leject = FALSE;
   GtkToggleButton *Ltbtn = NULL;
 
-  Lblank = get_blank_type(Ahash);
+  Lblank = get_blank_type(Ag);
 
-  if ((Ltbtn = GTK_TOGGLE_BUTTON(sc_hash_table_lookupv(Ahash, "%smulti", 
Aop))))
+  if ((Ltbtn = GTK_TOGGLE_BUTTON(sc_grave_get_widgetv(Ag, "%smulti", Aop))))
     Lmulti =gtk_toggle_button_get_active(Ltbtn);
 
   _DEB("on veut graver %d cd simul(%d)", Lnbrgravure, Lsimul ? 1 : 0);
@@ -420,20 +420,20 @@
     }
 
     *Lcont = 1;
-    g_hash_table_insert(Ahash, "lasttrack", &Llasttrack);
+    sc_grave_set_data(Ag, &Llasttrack, "lasttrack");
     Lcom = g_io_channel_unix_new( g_out );
     g_io_channel_set_encoding (Lcom, NULL, NULL);
     g_io_channel_set_buffered(Lcom, FALSE);
     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_grave_callback, Ahash);
+                                      cdrecord_grave_callback, Ag);
   
     Lcomerr = g_io_channel_unix_new( g_err );
     g_io_channel_set_encoding (Lcomerr, NULL, NULL);
     g_io_channel_set_buffered(Lcomerr, FALSE);
     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_grave_callback, Ahash); 
+                                      cdrecord_grave_callback, Ag); 
     
     while (*Lcont > 0 && *Labort == FALSE) {
       gtk_main_iteration();    
@@ -450,7 +450,7 @@
     g_spawn_close_pid(*Lpid);
     *Lpid = 0;
 
-    g_hash_table_remove(Ahash, "lasttrack");
+    sc_grave_del_data(Ag, "lasttrack");
 
     if (*Aerror) {
       _DEB("IL Y A UNE ERREUR !!");
@@ -513,25 +513,24 @@
 gboolean cdrecord_grave_callback(GIOChannel *Astd, GIOCondition Acond, 
gpointer Adata)
 {
   GIOStatus Lstatus;
-  GHashTable *Lhash = (GHashTable *)Adata;
+  Tgrave *Lg = (Tgrave *)Adata;
   gchar Lbuffer[_BUF_SIZE];
-  gint *Lcont = (gint *) g_hash_table_lookup(Lhash, "cont"); /* on traite 
encore des donnees ? */
-  GError **Lerreur = (GError **) g_hash_table_lookup(Lhash, "gerror"); /* 
pointeur erreur */
-  gint *Ltodo = (gint *) g_hash_table_lookup(Lhash, "todo"); /* nombre de 
piste a traiter */
-  gint *Ldone = (gint *) g_hash_table_lookup(Lhash, "done"); /* nombre de 
piste deja traite */
-  gchar *Llasttrack = (gchar *) g_hash_table_lookup(Lhash, "lasttrack"); /* 
precedente piste traite */
+  gint *Lcont = (gint *) sc_grave_get_data(Lg, "cont"); /* on traite encore 
des donnees ? */
+  GError **Lerreur = (GError **) sc_grave_get_data(Lg, "gerror"); /* pointeur 
erreur */
+  gint *Ltodo = (gint *) sc_grave_get_data(Lg, "todo"); /* nombre de piste a 
traiter */
+  gint *Ldone = (gint *) sc_grave_get_data(Lg, "done"); /* nombre de piste 
deja traite */
+  gchar *Llasttrack = (gchar *) sc_grave_get_data(Lg, "lasttrack"); /* 
precedente piste traite */
   gchar *f, *e;
   gchar *Ltxt;
-  gchar Lsbuf[200], Lsbuf2[200];
+  gchar Lsbuf[200];
   gdouble Ltotaldone = 1, Ltotaltodo, Lfifo, Lpct, Lgbuf = 0, Ltava;
   gsize Llu = 0;
   gchar *Ltracknum;
 
-  GtkLabel *Ltitle = GTK_LABEL(g_hash_table_lookup(Lhash, "gravetitle"));
-  GtkProgressBar *Lprogressbar = GTK_PROGRESS_BAR(g_hash_table_lookup(Lhash, 
"pb_total"));
-  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(g_hash_table_lookup(Lhash, 
"pb_step"));
-  GtkProgressBar *LprogressbarFifo = 
GTK_PROGRESS_BAR(g_hash_table_lookup(Lhash, "pb_fifo"));
-  GtkProgressBar *LprogressbarBuffer = 
GTK_PROGRESS_BAR(g_hash_table_lookup(Lhash, "pb_buffer"));
+  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Lg, "gravetitle"));
+  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"pb_step"));
+  GtkProgressBar *LprogressbarFifo = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"pb_fifo"));
+  GtkProgressBar *LprogressbarBuffer = 
GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, "pb_buffer"));
   
   /* fin du callback lorsque l'on recoi un signal comme quoi le pipe est ferme 
*/
   if (Acond == G_IO_HUP || Acond == G_IO_ERR) {
@@ -636,7 +635,7 @@
     /* blanking disk */
     gtk_label_set_text(Ltitle, _("Blanking..."));
   } else if ((f=strstr(Lbuffer, CDRECORD_STATUS))) {
-    gboolean *Lstatus = (gboolean *) g_hash_table_lookup(Lhash, 
"operationstatus");
+    gboolean *Lstatus = (gboolean *) sc_grave_get_data(Lg, "operationstatus");
 /* bug 11803
  * cause des problems apparements, a tester .. 
     f=f+strlen(CDRECORD_STATUS);
@@ -693,32 +692,32 @@
   return TRUE;
 }
 
-gboolean gravepiste(GHashTable *Ahash, GError **Aerror) {
-  GtkWindow *Lwindow = GTK_WINDOW(g_hash_table_lookup(Ahash, "window_burn"));
-  GtkLabel *Ltitle = GTK_LABEL(g_hash_table_lookup(Ahash, "gravetitle"));
-  GtkWidget *Lvitesse = g_hash_table_lookup(Ahash, "dstaudiospeed");
-  GtkWidget *Lgraveur = g_hash_table_lookup(Ahash, "dstaudiocombo");
-  gchar **Lrepertoire = (gchar **)g_hash_table_lookup(Ahash, "tmpdir");
-  gboolean *Loperationstatus = (gboolean *)g_hash_table_lookup(Ahash, 
"operationstatus");
-  gboolean *Labort = (gboolean *) g_hash_table_lookup(Ahash, "gabort");
+gboolean gravepiste(Tgrave *Ag, GError **Aerror) {
+  GtkWindow *Lwindow = GTK_WINDOW(sc_grave_get_widget(Ag, "window_burn"));
+  GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
+  GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstaudiospeed");
+  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstaudiocombo");
+  gchar **Lrepertoire = (gchar **)sc_grave_get_data(Ag, "tmpdir");
+  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;
   guint Lcomevent, Lcomerrevent;
-  gint *Lcont = (gint *) g_hash_table_lookup(Ahash, "cont"); /* on traite 
encore des donnees ? */
+  gint *Lcont = (gint *) sc_grave_get_data(Ag, "cont"); /* on traite encore 
des donnees ? */
   /* nombre d'element total */
-  gint *Ldone = (gint *)g_hash_table_lookup(Ahash, "done"); /* fais */
-  gint *Ltodo = (gint *) g_hash_table_lookup(Ahash, "todo");
-  gint *Lpid = (gint *) g_hash_table_lookup(Ahash, "pid");
+  gint *Ldone = (gint *)sc_grave_get_data(Ag, "done"); /* fais */
+  gint *Ltodo = (gint *) sc_grave_get_data(Ag, "todo");
+  gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
   
   gint g_out, g_err, Lnbrarg;
   gboolean Lstatus = FALSE;
   gchar *Lbufvitesse, *Lbufgrav;
-  gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_hash_table_lookup(Ahash, 
"audiosimul")));
-  gboolean Lnotfix = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_hash_table_lookup(Ahash, 
"audionotfix")));
-  gboolean Ldaomode = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_hash_table_lookup(Ahash, 
"audiodao")));
-  gint Lnbrgravure = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(g_hash_table_lookup(Ahash, 
"nbrcdaudio")));
+  gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"audiosimul")));
+  gboolean Lnotfix = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"audionotfix")));
+  gboolean Ldaomode = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"audiodao")));
+  gint Lnbrgravure = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widget(Ag, 
"nbrcdaudio")));
   gboolean Lwanteject = conf_get_boolean("eject");
   gint Lcurcd;
   gboolean Ldosimul;
@@ -730,7 +729,7 @@
   Lfileslist = make_audio_fileslist(*Ltodo);
   Lbufvitesse = get_combo_value(Lvitesse);
   Lbufgrav = get_combo_value(Lgraveur);
-  Lblank = get_blank_type(Ahash);
+  Lblank = get_blank_type(Ag);
 
   *Ltodo = (*Ltodo) * ((Lnbrgravure) + (Lsimul ? 1 : 0));
 
@@ -795,20 +794,20 @@
     }
 
     *Lcont = 1;
-    g_hash_table_insert(Ahash, "lasttrack", &Llasttrack);
+    sc_grave_set_data(Ag, &Llasttrack, "lasttrack");
     Lcom = g_io_channel_unix_new( g_out );
     g_io_channel_set_encoding (Lcom, NULL, NULL);
     g_io_channel_set_buffered(Lcom, FALSE);
     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_grave_callback, Ahash);
+                                        cdrecord_grave_callback, Ag);
   
     Lcomerr = g_io_channel_unix_new( g_err );
     g_io_channel_set_encoding (Lcomerr, NULL, NULL);
     g_io_channel_set_buffered(Lcomerr, FALSE);
     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_grave_callback, Ahash);  
+                                        cdrecord_grave_callback, Ag);  
     
     while (*Lcont>0 && *Labort == FALSE) {
       gtk_main_iteration(); 
@@ -825,7 +824,7 @@
     g_spawn_close_pid(*Lpid);
     *Lpid = 0;
 
-    g_hash_table_remove(Ahash, "lasttrack");
+    sc_grave_del_data(Ag, "lasttrack");
 
     if (*Aerror) {
       Lstatus = FALSE;
@@ -872,8 +871,8 @@
 gboolean common_blankorfix_callback(GIOChannel *Astd, GIOCondition Acond, 
gpointer Adata)
 {
   GIOStatus Lstatus;
-  GHashTable *Lhash = (GHashTable *)Adata;
-  gint *Lcont = (gint *) g_hash_table_lookup(Lhash, "cont"); /* on traite 
encore des donnees ? */
+  Tgrave *Lg = (Tgrave *)Adata;
+  gint *Lcont = (gint *) sc_grave_get_data(Lg, "cont"); /* on traite encore 
des donnees ? */
   gchar *Lbuffer = NULL;
   /* fin du callback lorsque l'on recoi un signal comme quoi le pipe est ferme 
*/
   if (Acond == G_IO_HUP || Acond == G_IO_ERR) {
@@ -888,24 +887,24 @@
 
   if (!strcmp(Lbuffer, CDRECORD_BLANKING_TIME)) {
     /* fin de l'operation: effacer un cdrw */
-    gboolean *Loperationstatus = (gboolean *)g_hash_table_lookup(Lhash, 
"operationstatus");
+    gboolean *Loperationstatus = (gboolean *)sc_grave_get_data(Lg, 
"operationstatus");
     *Loperationstatus = TRUE;
   } else if (!strcmp(Lbuffer, CDRECORD_FIXATING_TIME)) {
     /* fin de l'operation: cloturer un cdr */
-     gboolean *Loperationstatus = (gboolean *)g_hash_table_lookup(Lhash, 
"operationstatus");
+     gboolean *Loperationstatus = (gboolean *)sc_grave_get_data(Lg, 
"operationstatus");
     *Loperationstatus = TRUE;
   } else if (strstr(Lbuffer, CDRECORD_CANNOT_BLANK)) {
-    GError **Lerreur = (GError **) g_hash_table_lookup(Lhash, "gerror"); /* 
pointeur erreur */
+    GError **Lerreur = (GError **) sc_grave_get_data(Lg, "gerror"); /* 
pointeur erreur */
     if (!*Lerreur)
       g_set_error(Lerreur, GRAVEMAN_ERROR, _ERR_CANNOT_BLANK, _("Cannot blank 
disk, aborting."));
   } else if (strstr(Lbuffer, CDRECORD_INCOMPATIBLE_MEDIUM)) {
     /* hum, erreur */
-    GError **Lerreur = (GError **) g_hash_table_lookup(Lhash, "gerror"); /* 
pointeur erreur */
+    GError **Lerreur = (GError **) sc_grave_get_data(Lg, "gerror"); /* 
pointeur erreur */
     if (!*Lerreur)
       g_set_error(Lerreur, GRAVEMAN_ERROR, _ERR_INCOMPATIBLE_MEDIUM, _("Cannot 
blank disk, this is not a CD-RW !"));
   } else if (strstr(Lbuffer, CDRECORD_ERRORDISK)) {
     /* erreur pas de cd */
-    GError **Lerreur = (GError **) g_hash_table_lookup(Lhash, "gerror"); /* 
pointeur erreur */
+    GError **Lerreur = (GError **) sc_grave_get_data(Lg, "gerror"); /* 
pointeur erreur */
     if (!*Lerreur)
       g_set_error(Lerreur, GRAVEMAN_ERROR, _ERR_NO_CD, _("Error, a CD-R/CD-RW 
is required in the cd recorder !"));
   }
@@ -915,7 +914,7 @@
 }
 
 /* cloturer un cdr*/
-gboolean perform_fix_cd(GHashTable *Ahash, GError **Aerror)
+gboolean perform_fix_cd(Tgrave *Ag, GError **Aerror)
 {
   gchar **Lcmd;
   gchar *Lcommandline, *Lbufgrav;
@@ -923,11 +922,11 @@
   GIOChannel *Lcom, *Lcomerr;
   guint Lcomevent, Lcomerrevent;
   gint g_out, g_err, Lnbrarg;
-  gint *Lcont = g_hash_table_lookup(Ahash, "cont");
-  GtkWidget *Lgraveur = g_hash_table_lookup(Ahash, "dstothercombo");
+  gint *Lcont = sc_grave_get_data(Ag, "cont");
+  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstothercombo");
 
   /* pid de cdrecord */
-  gint *Lpid = (gint *) g_hash_table_lookup(Ahash, "pid");
+  gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
 
   Lbufgrav = get_combo_value(Lgraveur);
   Lcommandline = g_strdup_printf("%s dev=%s -v -fix", 
conf_get_string("cdrecord"), Lbufgrav);
@@ -954,13 +953,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),
-                                      common_blankorfix_callback, Ahash);
+                                      common_blankorfix_callback, Ag);
   
   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),
-                                      common_blankorfix_callback, Ahash);  
+                                      common_blankorfix_callback, Ag);  
 _DEB("cont vaut => %d\n", *Lcont);
   while (*Lcont > 1) {
     gtk_main_iteration(); 
@@ -996,7 +995,7 @@
 }
 
 /* effacer un cdrw */
-gboolean perform_erase_cdrw(GHashTable *Ahash, GError **Aerror)
+gboolean perform_erase_cdrw(Tgrave *Ag, GError **Aerror)
 {
   gchar **Lcmd;
   gchar *Lcommandline, *Lbufgrav;
@@ -1004,12 +1003,12 @@
   GIOChannel *Lcom, *Lcomerr;
   guint Lcomevent, Lcomerrevent;
   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");
+  gint *Lcont = sc_grave_get_data(Ag, "cont");
+  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstothercombo");
+  gboolean *Lfastblank = sc_grave_get_data(Ag, "usefastblank");
 
   /* pid de cdrecord */
-  gint *Lpid = (gint *) g_hash_table_lookup(Ahash, "pid");
+  gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
 
   Lbufgrav = get_combo_value(Lgraveur);
   Lcommandline = g_strdup_printf("%s dev=%s -v gracetime=2 blank=%s",
@@ -1038,13 +1037,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),
-                                      common_blankorfix_callback, Ahash);
+                                      common_blankorfix_callback, Ag);
   
   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),
-                                      common_blankorfix_callback, Ahash);  
+                                      common_blankorfix_callback, Ag);  
 _DEB("cont vaut => %d\n", *Lcont);
   while (*Lcont > 1) {
     gtk_main_iteration();