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

[sylvain cresto]

Index: graveman/current/src/sox.c
diff -u graveman/current/src/sox.c:1.11 graveman/current/src/sox.c:1.12
--- graveman/current/src/sox.c:1.11     Tue Feb 15 22:44:44 2005
+++ graveman/current/src/sox.c  Sat Feb 19 17:49:08 2005
@@ -69,11 +69,11 @@
 gboolean sox_callback(GIOChannel *Astd, GIOCondition Acond, gpointer Adata)
 {
   GIOStatus Lstatus;
-  GHashTable *Lhash = (GHashTable *)Adata;
+  Tgrave *Lg = (Tgrave *)Adata;
   gchar *Lbuffer = NULL;  
   gchar *s;
-  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 *Lcont = (gint *) sc_grave_get_data(Lg, "cont"); /* on traite encore 
des donnees ? */
+  GError **Lerreur = (GError **) sc_grave_get_data(Lg, "gerror"); /* pointeur 
erreur */
 
 
   /* fin du callback lorsque l'on recoi un signal comme quoi le pipe est ferme 
*/
@@ -98,13 +98,13 @@
   return TRUE;
 }
 
-gboolean SoundToCdr(GHashTable *Ahash, gchar *AFichier, gchar *AVers, GError 
**Aerror)
+gboolean SoundToCdr(Tgrave *Ag, gchar *AFichier, gchar *AVers, GError **Aerror)
 {
   gchar *Lcommandline;
   gchar **Lcmd;
-  gint *Lpid = (gint *) g_hash_table_lookup(Ahash, "pid");
-  gboolean *Labort = (gboolean *)g_hash_table_lookup(Ahash, "gabort");
-  gint *Lcont = (gint *) g_hash_table_lookup(Ahash, "cont");
+  gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
+  gboolean *Labort = (gboolean *)sc_grave_get_data(Ag, "gabort");
+  gint *Lcont = (gint *) sc_grave_get_data(Ag, "cont");
   gint g_out, g_err, Lnbrarg;
   gchar *Lfic;
   gchar *Lvers;
@@ -139,14 +139,14 @@
   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),
                                             sox_callback,
-                                            Ahash);
+                                            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),
                                             sox_callback,
-                                            Ahash);  
+                                            Ag);  
 
   while (*Lcont > 1 && *Labort == FALSE) {
     gtk_main_iteration();