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

[sylvain cresto]

Index: graveman/current/src/audio.c
diff -u graveman/current/src/audio.c:1.7 graveman/current/src/audio.c:1.8
--- graveman/current/src/audio.c:1.7    Sat Feb 12 16:41:07 2005
+++ graveman/current/src/audio.c        Sat Feb 19 17:49:08 2005
@@ -27,12 +27,12 @@
 /* appele pour chaque entree de la liste */
 gboolean foreachtracks(GtkTreeModel *Amodel, GtkTreePath *Apath, GtkTreeIter 
*Aiter, gpointer Adata)
 {
-  GHashTable *Lhash = (GHashTable *) Adata;
-  GtkLabel *LTitle = GTK_LABEL(g_hash_table_lookup(Lhash, "gravetitle"));
-  gchar **Ltmpdir = (gchar **) g_hash_table_lookup(Lhash, "tmpdir");
-  gint *Ldone = (gint *) g_hash_table_lookup(Lhash, "done");  
-  gint *Lcont = (gint *) g_hash_table_lookup(Lhash, "cont");
-  GError **Lerreur = (GError **) g_hash_table_lookup(Lhash, "gerror");  
+  Tgrave *Lg = (Tgrave *) Adata;
+  GtkLabel *LTitle = GTK_LABEL(sc_grave_get_widget(Lg, "gravetitle"));
+  gchar **Ltmpdir = (gchar **) sc_grave_get_data(Lg, "tmpdir");
+  gint *Ldone = (gint *) sc_grave_get_data(Lg, "done");  
+  gint *Lcont = (gint *) sc_grave_get_data(Lg, "cont");
+  GError **Lerreur = (GError **) sc_grave_get_data(Lg, "gerror");  
   
   gboolean Lreturn = FALSE;
   gchar *Lutf8, *Lvers, *Lfichierlcl, *Lfichierutf8, *Lficname;
@@ -57,7 +57,7 @@
   Lvers = g_strdup_printf("%s/piste_%d.cdr", *Ltmpdir, (*Ldone)++);
   
   /* conversion pistes audio en piste cdr pour la gravure */ 
-  Lreturn = (SoundToCdr(Lhash, Lfichierlcl, Lvers, Lerreur) == TRUE ? FALSE : 
TRUE);
+  Lreturn = (SoundToCdr(Lg, Lfichierlcl, Lvers, Lerreur) == TRUE ? FALSE : 
TRUE);
   g_free(Lvers);  
   g_free(Lfichierlcl); g_free(Lfichierutf8);
 
@@ -83,13 +83,13 @@
   return Lreturn;
 }
   
-gboolean preparetrack(GHashTable *Ahash, GError **Aerror) {
-  gchar **Ltmpdir = (gchar **)g_hash_table_lookup(Ahash, "tmpdir");
-  gboolean *Labort = (gboolean *)g_hash_table_lookup(Ahash, "gabort");
-  gint *Lcont = (gint *)g_hash_table_lookup(Ahash, "cont");
+gboolean preparetrack(Tgrave *Ag, GError **Aerror) {
+  gchar **Ltmpdir = (gchar **)sc_grave_get_data(Ag, "tmpdir");
+  gboolean *Labort = (gboolean *)sc_grave_get_data(Ag, "gabort");
+  gint *Lcont = (gint *)sc_grave_get_data(Ag, "cont");
   gchar *Lnamedir;
-  GtkTreeModel *Ltreemodel = 
gtk_tree_view_get_model(GTK_TREE_VIEW(g_hash_table_lookup(Ahash, 
"LISTEAUDIO")));
-  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(g_hash_table_lookup(Ahash, 
"pb_step"));
+  GtkTreeModel *Ltreemodel = 
gtk_tree_view_get_model(GTK_TREE_VIEW(sc_grave_get_widget(Ag, "LISTEAUDIO")));
+  GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(sc_grave_get_widget(Ag, 
"pb_step"));
   g_assert(GTK_IS_TREE_MODEL(Ltreemodel));
 
   Lnamedir = g_strdup_printf("%s/%s", conf_get_string_def("tmpdir", "/tmp"), 
"gravemanXXXXXX");
@@ -104,10 +104,10 @@
   *Ltmpdir = Lnamedir;
 
   *Lcont = 2;
-  g_timeout_add(500, encours_callback, Ahash);
+  g_timeout_add(500, encours_callback, Ag);
 
   /* conversion de chaques fichiers */
-  gtk_tree_model_foreach(Ltreemodel, foreachtracks, Ahash);
+  gtk_tree_model_foreach(Ltreemodel, foreachtracks, Ag);
 
   /* on attend la fin du timeout */
   *Lcont = 1;