[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Graveman-cvs] Changes to graveman/current/src/readcd.c
From: |
sylvain cresto |
Subject: |
[Graveman-cvs] Changes to graveman/current/src/readcd.c |
Date: |
Sat, 19 Feb 2005 12:49:32 -0500 |
Index: graveman/current/src/readcd.c
diff -u graveman/current/src/readcd.c:1.8 graveman/current/src/readcd.c:1.9
--- graveman/current/src/readcd.c:1.8 Tue Feb 15 22:44:44 2005
+++ graveman/current/src/readcd.c Sat Feb 19 17:49:08 2005
@@ -43,16 +43,16 @@
gboolean readcd_makeimage_callback(GIOChannel *Astd, GIOCondition Acond,
gpointer Adata)
{
GIOStatus Lstatus;
- GHashTable *Lhash = (GHashTable *)Adata;
- 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"));
- 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 */
- gdouble *Lreadtodo = (gdouble *) g_hash_table_lookup(Lhash, "readtodo"); /*
nombre de secteur a traiter */
- 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 **Lvitesse = (gchar **) g_hash_table_lookup(Lhash, "tmpdir"); /* en
fait la vitesse de lecture */
+ Tgrave *Lg = (Tgrave *)Adata;
+ GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Lg, "gravetitle"));
+ GtkProgressBar *Lprogressbar = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg,
"pb_total"));
+ GtkProgressBar *Lprogressbar2 = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg,
"pb_step"));
+ 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 */
+ gdouble *Lreadtodo = (gdouble *) sc_grave_get_data(Lg, "readtodo"); /*
nombre de secteur a traiter */
+ 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 **Lvitesse = (gchar **) sc_grave_get_data(Lg, "tmpdir"); /* en fait
la vitesse de lecture */
gchar Lbuffer[_BUF_SIZE];
gdouble Ltotaldone, Lpct, Ltava;
gchar *e, *f;
@@ -130,7 +130,7 @@
return FALSE;
} else if ((f=strstr(Lbuffer, READCD_DONE))) {
/* fin de l'operation */
- gboolean *Lstatus = (gboolean *) g_hash_table_lookup(Lhash,
"operationstatus");
+ gboolean *Lstatus = (gboolean *) sc_grave_get_data(Lg, "operationstatus");
*Lstatus = TRUE;
}
@@ -138,24 +138,24 @@
}
/* creation d'une image iso */
-gboolean make_image(GHashTable *Ahash, GError **Aerror)
+gboolean make_image(Tgrave *Ag, GError **Aerror)
{
gchar **Lcmd;
gchar *Lcommandline;
GIOChannel *Lcom, *Lcomerr;
guint Lcomevent, Lcomerrevent;
- gint *Lcont = g_hash_table_lookup(Ahash, "cont");
- gboolean *Labort = (gboolean *) g_hash_table_lookup(Ahash, "gabort");
- GtkLabel *Ltitle = GTK_LABEL(g_hash_table_lookup(Ahash, "gravetitle"));
- gint *Lpid = (gint *) g_hash_table_lookup(Ahash, "pid");
- GtkWidget *Lvitesse = g_hash_table_lookup(Ahash, "dstcopyspeed");
- gchar **Liso = (gchar **)g_hash_table_lookup(Ahash, "iso"); /* image iso */
+ gint *Lcont = sc_grave_get_data(Ag, "cont");
+ gboolean *Labort = (gboolean *) sc_grave_get_data(Ag, "gabort");
+ GtkLabel *Ltitle = GTK_LABEL(sc_grave_get_widget(Ag, "gravetitle"));
+ gint *Lpid = (gint *) sc_grave_get_data(Ag, "pid");
+ GtkWidget *Lvitesse = sc_grave_get_widget(Ag, "dstcopyspeed");
+ gchar **Liso = (gchar **)sc_grave_get_data(Ag, "iso"); /* image iso */
gdouble Lreadtodo = 0;
gint g_in, g_out, g_err, Lnbrarg;
gboolean Lstatus = FALSE;
gchar *Lbufvitesse;
gchar *Lbuflect;
- GtkWidget *Llecteur = g_hash_table_lookup(Ahash, "srccopycombo");
+ GtkWidget *Llecteur = sc_grave_get_widget(Ag, "srccopycombo");
gtk_label_set_text(Ltitle, _("Duplication will start shortly..."));
@@ -182,19 +182,19 @@
return FALSE;
}
*Lcont = 1;
- g_hash_table_insert(Ahash, "readtodo", &Lreadtodo);
+ sc_grave_set_data(Ag, &Lreadtodo, "readtodo");
Lcom = g_io_channel_unix_new( g_out );
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),
- readcd_makeimage_callback, Ahash);
+ readcd_makeimage_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),
- readcd_makeimage_callback, Ahash);
+ readcd_makeimage_callback, Ag);
while (*Lcont>0 && *Labort == FALSE) {
gtk_main_iteration();
}
@@ -212,7 +212,7 @@
g_spawn_close_pid(*Lpid);
*Lpid = 0;
- g_hash_table_remove(Ahash, "readtodo");
+ sc_grave_del_data(Ag, "readtodo");
if (*Aerror) {
_DEB("IL Y A UNE ERREUR !!");
@@ -259,9 +259,9 @@
gboolean readcd_getsize_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 ? */
- gint *Ltodo = (gint *) g_hash_table_lookup(Lhash, "todo"); /* nombre de
piste a traiter */
+ Tgrave *Lg = (Tgrave *)Adata;
+ gint *Lcont = (gint *) sc_grave_get_data(Lg, "cont"); /* on traite encore
des donnees ? */
+ gint *Ltodo = (gint *) sc_grave_get_data(Lg, "todo"); /* nombre de piste a
traiter */
gchar *f, *e;
gchar *Lbuffer = NULL;