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

[sylvain cresto]

Index: graveman/current/src/matos.c
diff -u graveman/current/src/matos.c:1.13 graveman/current/src/matos.c:1.14
--- graveman/current/src/matos.c:1.13   Thu Feb 17 01:22:53 2005
+++ graveman/current/src/matos.c        Sat Feb 19 17:49:08 2005
@@ -154,21 +154,19 @@
 }
 
 /* operation de copie */
-gboolean burn_copy(GHashTable *Ahash, GError **Aerror)
+gboolean burn_copy(Tgrave *Ag, GError **Aerror)
 {
-  GtkWidget *Llecteur = g_hash_table_lookup(Ahash, "srccopycombo");
-  GtkWidget *Lgraveur = g_hash_table_lookup(Ahash, "dstcopycombo");
-  GtkEntry *Llecteuriso = GTK_ENTRY(g_hash_table_lookup(Ahash, 
"srccopybtnvalue"));
-  GtkEntry *Lgraveuriso = GTK_ENTRY(g_hash_table_lookup(Ahash, 
"dstcopybtnvalue"));
-  gboolean *Labort = (gboolean *)g_hash_table_lookup(Ahash, "gabort");
+  GtkWidget *Llecteur = sc_grave_get_widget(Ag, "srccopycombo");
+  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstcopycombo");
+  GtkEntry *Llecteuriso = GTK_ENTRY(sc_grave_get_widget(Ag, 
"srccopybtnvalue"));
+  GtkEntry *Lgraveuriso = GTK_ENTRY(sc_grave_get_widget(Ag, 
"dstcopybtnvalue"));
   gchar *Lsrc = get_combo_value(Llecteur);
   gchar *Ldst = get_combo_value(Lgraveur);
   gchar *Liso = NULL;
   gchar *Ltxt;
   gboolean Lstatus;
   gboolean Loperationstatus = FALSE;
-  gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_hash_table_lookup(Ahash, 
"copysimul")));
-  gint Ltodo = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(g_hash_table_lookup(Ahash, 
"nbrcdcopy")));
+  gint Ltodo = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widget(Ag, 
"nbrcdcopy")));
   gint Ldone = 1;
   gchar *Ltmpdir = NULL;
   const gchar *Lptriso;
@@ -181,11 +179,11 @@
   }
 
   /* referecement variables */
-  g_hash_table_insert(Ahash, "todo", &Ltodo); /* a faire */
-  g_hash_table_insert(Ahash, "done", &Ldone); /* fais */
-  g_hash_table_insert(Ahash, "operationstatus", &Loperationstatus); /* 
resultat de l'operation */
-  g_hash_table_insert(Ahash, "tmpdir", &Ltmpdir); /* repertoire temporraire */
-  g_hash_table_insert(Ahash, "gerror", Aerror);  /* pointeur retour des 
erreurs */
+  sc_grave_set_data(Ag, &Ltodo, "todo"); /* a faire */
+  sc_grave_set_data(Ag, &Ldone, "done"); /* fais */
+  sc_grave_set_data(Ag, &Loperationstatus, "operationstatus"); /* resultat de 
l'operation */
+  sc_grave_set_data(Ag, &Ltmpdir, "tmpdir"); /* repertoire temporraire */
+  sc_grave_set_data(Ag, Aerror, "gerror");  /* pointeur retour des erreurs */
 
   if (!strcmp(Lsrc, "iso")) {
     /* copie d'une image vers un cd, on utilise cdrecord */
@@ -203,9 +201,9 @@
           Liso, g_strerror(errno));
       Lstatus = FALSE;
     } else {
-      g_hash_table_insert(Ahash, "iso", &Liso); /* image iso */
-      Lstatus = burn_from_image("copy", Ahash, Aerror);
-      g_hash_table_remove(Ahash, "iso");
+      sc_grave_set_data(Ag, &Liso, "iso"); /* image iso */
+      Lstatus = burn_from_image("copy", Ag, Aerror);
+      sc_grave_del_data(Ag, "iso");
     }
     g_free(Liso);
   } else if (!strcmp(Ldst, "iso")) {
@@ -229,9 +227,9 @@
           Ltxt, Liso, g_strerror(errno));
       Lstatus = FALSE;
     } else {
-      g_hash_table_insert(Ahash, "iso", &Liso); /* image iso */
-      Lstatus = make_image(Ahash, Aerror);
-      g_hash_table_remove(Ahash, "iso");
+      sc_grave_set_data(Ag, &Liso, "iso"); /* image iso */
+      Lstatus = make_image(Ag, Aerror);
+      sc_grave_del_data(Ag, "iso");
       g_free(Liso);
     }
   } else {  /* copie d'un cd a un autre, on utilise cdrdao */
@@ -254,14 +252,14 @@
       Ltmpdir = g_realloc(Ltmpdir, strlen(Ltmpdir)+strlen("/tmpiso.bin")+1);
       strcat(Ltmpdir, "/tmpiso.bin");
 
-      g_hash_table_insert(Ahash, "iso", &Ltmpdir); /* image iso */
+      sc_grave_set_data(Ag, &Ltmpdir, "iso"); /* image iso */
 
       /* copie du cd avec monsieur cdrdao */
-      Lstatus = copycd(Ahash, Aerror);
+      Lstatus = copycd(Ag, Aerror);
 
 
       /* on copie donc vers l'iso 
-      Lstatus = make_image(Ahash, Aerror);
+      Lstatus = make_image(Ag, Aerror);
       if (Lstatus == TRUE && *Labort == FALSE) {
         * et maintenant dans le sens inverse si tout va toujours bien * 
         Ldone++;
@@ -288,14 +286,14 @@
         }
        
         if (Lstatus == TRUE && *Labort == FALSE) { 
-          Lstatus = burn_from_image("copy", Ahash, Aerror);
+          Lstatus = burn_from_image("copy", Ag, Aerror);
         }
       } */
       if ((Ltxt=strrchr(Ltmpdir, '/'))) *Ltxt=0;
     
       deltempdir(Ltmpdir);
 
-      g_hash_table_remove(Ahash, "iso");
+      sc_grave_del_data(Ag, "iso");
     }
     g_free(Ltmpdir);
   }
@@ -306,13 +304,13 @@
 }
 
 /* operation gravure cd de donnee */
-gboolean burn_data(GHashTable *Ahash, GError **Aerror)
+gboolean burn_data(Tgrave *Ag, GError **Aerror)
 {
-  gint Ltodo = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(g_hash_table_lookup(Ahash, 
"nbrcddata")));
-  gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_hash_table_lookup(Ahash, 
"datasimul")));
-  GtkEntry *Lgraveuriso = GTK_ENTRY(g_hash_table_lookup(Ahash, 
"dstdatabtnvalue"));
-  GtkWidget *Lgraveur = g_hash_table_lookup(Ahash, "dstdatacombo");
-  gboolean *Labort = g_hash_table_lookup(Ahash, "gabort");
+  gint Ltodo = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widget(Ag, 
"nbrcddata")));
+  gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"datasimul")));
+  GtkEntry *Lgraveuriso = GTK_ENTRY(sc_grave_get_widget(Ag, 
"dstdatabtnvalue"));
+  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstdatacombo");
+  gboolean *Labort = sc_grave_get_data(Ag, "gabort");
   gint Ldone = 1;
   gchar *Ldst = get_combo_value(Lgraveur);
   gchar *Ltmpdir = NULL;
@@ -321,15 +319,15 @@
   gboolean Loperationstatus = FALSE;
   gboolean Lstatus;
 
-  g_hash_table_insert(Ahash, "todo", &Ltodo); /* a faire */
-  g_hash_table_insert(Ahash, "done", &Ldone); /* fais */
-  g_hash_table_insert(Ahash, "operationstatus", &Loperationstatus); /* 
resultat de l'operation */
-  g_hash_table_insert(Ahash, "gerror", Aerror);  /* pointeur retour des 
erreurs */
-  g_hash_table_insert(Ahash, "tmpdir", &Ltmpdir); /* repertoire temporraire */
+  sc_grave_set_data(Ag, &Ltodo, "todo"); /* a faire */
+  sc_grave_set_data(Ag, &Ldone, "done"); /* fais */
+  sc_grave_set_data(Ag, &Loperationstatus, "operationstatus"); /* resultat de 
l'operation */
+  sc_grave_set_data(Ag, Aerror, "gerror");  /* pointeur retour des erreurs */
+  sc_grave_set_data(Ag, &Ltmpdir, "tmpdir"); /* repertoire temporraire */
 
   /* on retourne dans ltmp le nom du repertoire temporraire utilise pour
    * l'operation */
-  Lstatus = preparedata(Ahash, Aerror);
+  Lstatus = preparedata(Ag, Aerror);
 _DEB("ici LDST => %s\n", Ldst);
   if (strcmp(Ldst, "iso")) {
     Liso = g_strdup_printf("%s.iso", Ltmpdir);
@@ -338,19 +336,19 @@
     Liso = _FILENAME(gtk_entry_get_text(Lgraveuriso));
     Ltodo = 1;
   }
-  g_hash_table_insert(Ahash, "iso", &Liso); /* image iso */
+  sc_grave_set_data(Ag, &Liso, "iso"); /* image iso */
   if (Lstatus && *Labort==FALSE) {
-    Lextrapara = make_image_getextrapara(Ahash, "data");
-    g_hash_table_insert(Ahash, "extrapara", &Lextrapara); /* parametres 
supplementaires */
-    Lstatus = make_iso(Ahash, Aerror);
-    g_hash_table_remove(Ahash, "extrapara");
+    Lextrapara = make_image_getextrapara(Ag, "data");
+    sc_grave_set_data(Ag, &Lextrapara, "extrapara"); /* parametres 
supplementaires */
+    Lstatus = make_iso(Ag, Aerror);
+    sc_grave_del_data(Ag, "extrapara");
     g_free(Lextrapara);
     if (strcmp(Ldst, "iso") && Lstatus && *Labort==FALSE) {
       /* ici il faut appeler cdrecord ! */
-      Lextrapara = burn_data_getextrapara(Ahash);
-      g_hash_table_insert(Ahash, "extrapara", &Lextrapara); /* parametres 
supplementaires */
-      Lstatus = burn_from_image("data", Ahash, Aerror);
-      g_hash_table_remove(Ahash, "extrapara");
+      Lextrapara = burn_data_getextrapara(Ag);
+      sc_grave_set_data(Ag, &Lextrapara, "extrapara"); /* parametres 
supplementaires */
+      Lstatus = burn_from_image("data", Ag, Aerror);
+      sc_grave_del_data(Ag, "extrapara");
       g_free(Lextrapara);
     }
   }
@@ -363,38 +361,38 @@
   }
   g_free(Liso);
 
-  g_hash_table_remove(Ahash, "todo");
-  g_hash_table_remove(Ahash, "done"); 
-  g_hash_table_remove(Ahash, "tmpdir"); g_free(Ltmpdir);
-  g_hash_table_remove(Ahash, "operationstatus"); 
-  g_hash_table_remove(Ahash, "gerror");
-  g_hash_table_remove(Ahash, "iso");
+  sc_grave_del_data(Ag, "todo");
+  sc_grave_del_data(Ag, "done"); 
+  sc_grave_del_data(Ag, "tmpdir"); g_free(Ltmpdir);
+  sc_grave_del_data(Ag, "operationstatus"); 
+  sc_grave_del_data(Ag, "gerror");
+  sc_grave_del_data(Ag, "iso");
 
   return Lstatus;
 }
 
 /* operation gravure cd audio */
-gboolean burn_audio(GHashTable *Ahash, GError **Aerror)
+gboolean burn_audio(Tgrave *Ag, GError **Aerror)
 {
-  GtkTreeModel *Ltreemodel = 
gtk_tree_view_get_model(GTK_TREE_VIEW(g_hash_table_lookup(Ahash, 
"LISTEAUDIO")));
+  GtkTreeModel *Ltreemodel = 
gtk_tree_view_get_model(GTK_TREE_VIEW(sc_grave_get_widget(Ag, "LISTEAUDIO")));
 
   gint Ltodo = gtk_tree_model_iter_n_children(Ltreemodel, NULL);
   gint Ldone = 0;
   gchar *Ltmpdir = NULL;
   gboolean Lstatus, Loperationstatus = FALSE;
 
-  g_hash_table_insert(Ahash, "todo", &Ltodo); /* a faire */
-  g_hash_table_insert(Ahash, "done", &Ldone); /* fais */
-  g_hash_table_insert(Ahash, "operationstatus", &Loperationstatus); /* 
resultat de l'operation */
-  g_hash_table_insert(Ahash, "gerror", Aerror);  /* pointeur retour des 
erreurs */
-  g_hash_table_insert(Ahash, "tmpdir", &Ltmpdir); /* repertoire temporraire */
+  sc_grave_set_data(Ag, &Ltodo, "todo"); /* a faire */
+  sc_grave_set_data(Ag, &Ldone, "done"); /* fais */
+  sc_grave_set_data(Ag, &Loperationstatus, "operationstatus"); /* resultat de 
l'operation */
+  sc_grave_set_data(Ag, Aerror, "gerror");  /* pointeur retour des erreurs */
+  sc_grave_set_data(Ag, &Ltmpdir, "tmpdir"); /* repertoire temporraire */
 
-  Lstatus = preparetrack(Ahash, Aerror);
+  Lstatus = preparetrack(Ag, Aerror);
 
   if (Lstatus == TRUE) {
     Ldone = 1;
 
-    Lstatus = gravepiste(Ahash, Aerror);
+    Lstatus = gravepiste(Ag, Aerror);
   }
 
   if (Ltmpdir) {
@@ -478,12 +476,12 @@
 }
 
 /* operation gravure dcd de donnee */
-gboolean burn_dvddata(GHashTable *Ahash, GError **Aerror)
+gboolean burn_dvddata(Tgrave *Ag, GError **Aerror)
 {
-  gint Ltodo = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(g_hash_table_lookup(Ahash, 
"nbrdvddata")));
-  gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_hash_table_lookup(Ahash, 
"dvddatasimul")));
-  GtkEntry *Lgraveuriso = GTK_ENTRY(g_hash_table_lookup(Ahash, 
"dstdvddatabtnvalue"));
-  GtkWidget *Lgraveur = g_hash_table_lookup(Ahash, "dstdvddatacombo");
+  gint Ltodo = 
gtk_spin_button_get_value(GTK_SPIN_BUTTON(sc_grave_get_widget(Ag, 
"nbrdvddata")));
+  gboolean Lsimul = 
gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(sc_grave_get_widget(Ag, 
"dvddatasimul")));
+  GtkEntry *Lgraveuriso = GTK_ENTRY(sc_grave_get_widget(Ag, 
"dstdvddatabtnvalue"));
+  GtkWidget *Lgraveur = sc_grave_get_widget(Ag, "dstdvddatacombo");
   gint Ldone = 1;
   gchar *Ldst = get_combo_value(Lgraveur);
   gchar *Ltmpdir = NULL;
@@ -492,42 +490,42 @@
   gboolean Loperationstatus = FALSE;
   gboolean Lstatus;
 
-  g_hash_table_insert(Ahash, "todo", &Ltodo); /* a faire */
-  g_hash_table_insert(Ahash, "done", &Ldone); /* fais */
-  g_hash_table_insert(Ahash, "operationstatus", &Loperationstatus); /* 
resultat de l'operation */
-  g_hash_table_insert(Ahash, "gerror", Aerror);  /* pointeur retour des 
erreurs */
-  g_hash_table_insert(Ahash, "tmpdir", &Ltmpdir); /* repertoire temporraire */
+  sc_grave_set_data(Ag, &Ltodo, "todo"); /* a faire */
+  sc_grave_set_data(Ag, &Ldone, "done"); /* fais */
+  sc_grave_set_data(Ag, &Loperationstatus, "operationstatus"); /* resultat de 
l'operation */
+  sc_grave_set_data(Ag, Aerror, "gerror");  /* pointeur retour des erreurs */
+  sc_grave_set_data(Ag, &Ltmpdir, "tmpdir"); /* repertoire temporraire */
 
   /* on retourne dans ltmp le nom du repertoire temporraire utilise pour
    * l'operation */
-  Lstatus = preparedata(Ahash, Aerror);
+  Lstatus = preparedata(Ag, Aerror);
 _DEB("ici LDST => %s\n", Ldst);
 
-  Lextrapara = make_image_getextrapara(Ahash, "dvddata");
-  g_hash_table_insert(Ahash, "extrapara", &Lextrapara); /* parametres 
supplementaires */
+  Lextrapara = make_image_getextrapara(Ag, "dvddata");
+  sc_grave_set_data(Ag, &Lextrapara, "extradata"); /* parametres 
supplementaires */
   if (strcmp(Ldst, "iso")) {
     if (Lsimul) Ltodo++; /* 1 pour la simulation */
 
-    Lstatus = burn_dvd(Ahash, Aerror);
+    Lstatus = burn_dvd(Ag, Aerror);
 
   } else {
     Liso = _FILENAME(gtk_entry_get_text(Lgraveuriso));
     Ltodo = 1;
-    g_hash_table_insert(Ahash, "iso", &Liso); /* image iso */
-    Lstatus = make_iso(Ahash, Aerror);
-    g_hash_table_remove(Ahash, "iso");
+    sc_grave_set_data(Ag, &Liso, "iso"); /* image iso */
+    Lstatus = make_iso(Ag, Aerror);
+    sc_grave_del_data(Ag, "iso");
     g_free(Liso);
   }
-  g_hash_table_remove(Ahash, "extrapara");
+  sc_grave_del_data(Ag, "extrapara");
   g_free(Lextrapara);
 
   deltempdir(Ltmpdir);
 
-  g_hash_table_remove(Ahash, "todo");
-  g_hash_table_remove(Ahash, "done"); 
-  g_hash_table_remove(Ahash, "tmpdir"); g_free(Ltmpdir);
-  g_hash_table_remove(Ahash, "operationstatus"); 
-  g_hash_table_remove(Ahash, "gerror");
+  sc_grave_del_data(Ag, "todo");
+  sc_grave_del_data(Ag, "done"); 
+  sc_grave_del_data(Ag, "tmpdir"); g_free(Ltmpdir);
+  sc_grave_del_data(Ag, "operationstatus"); 
+  sc_grave_del_data(Ag, "gerror");
 
   return Lstatus;
 }