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

[sylvain cresto]

Index: graveman/current/src/interface.c
diff -u graveman/current/src/interface.c:1.26 
graveman/current/src/interface.c:1.27
--- graveman/current/src/interface.c:1.26       Sat Feb 19 17:49:08 2005
+++ graveman/current/src/interface.c    Sun Feb 20 17:45:02 2005
@@ -231,7 +231,6 @@
   if (GTK_IS_LIST_STORE(Ldata)) {
     gtk_list_store_clear(Ldata);
   }
-printf("toto la !\n"); 
   for (Lcur = Glistdrives, i=0; Lcur; Lcur = g_slist_next(Lcur), i++) { 
     Ldrive = (Tdriveinfo *)Lcur->data;
     if ((Aquoi & TYPE_ALLWRITER) && (! DRIVE_WRITER(Ldrive))) continue;
@@ -608,6 +607,13 @@
   Lmainbody = GTK_HBOX(sc_grave_get_widget(Lg, "mainbody"));
   Lwindow = GTK_WIDGET(sc_grave_get_widget(Lg, "topwindow"));
 
+  sc_grave_set_data(Lg, Aaudiolen, "audiolen");
+  sc_grave_set_data(Lg, Aaudiomaxlen, "audiomaxlen");
+  sc_grave_set_data(Lg, Adatasize, "datasize");
+  sc_grave_set_data(Lg, Adatamaxsize, "datamaxsize");
+  sc_grave_set_data(Lg, Advddatasize, "dvddatasize");
+  sc_grave_set_data(Lg, Advddatamaxsize, "dvddatamaxsize");
+
   /* onglets page de droite */
   Lbodycdaudio = GTK_NOTEBOOK(sc_grave_get_widget(Lg, "bodycdaudio"));
   gtk_widget_reparent(GTK_WIDGET(Lbodycdaudio), GTK_WIDGET(Lmainbody));
@@ -797,12 +803,8 @@
   gboolean Lreadcd, Lwritecdr, Lwritecdrw, Lreaddvd, Lwritedvd;
 
   get_current_matos(&Lreadcd, &Lwritecdr, &Lwritecdrw, &Lreaddvd, &Lwritedvd);
-printf("toto\n");
-if (GTK_IS_WIDGET(Lsrccopycombo)) {
-  printf("oui !\n");
-}
+  
   remplirecombograveur(Lsrccopycombo, TYPE_ALL + TYPE_ISO, 
conf_get_string("srccopycombo"));
-printf("toto2\n");
   
   remplirecombograveur(Ldstcopycombo, TYPE_ALLWRITER + TYPE_ISO, 
conf_get_string("dstcopycombo"));
   
@@ -1071,10 +1073,10 @@
 
 void hide_some_progressbar(Tgrave *Ag)
 {
-  GtkWidget *Lpbfifo = sc_grave_get_data(Ag, "pb_fifo");
-  GtkWidget *Lpbbuffer = sc_grave_get_data(Ag, "pb_buffer");
-  GtkWidget *Llfifo = sc_grave_get_data(Ag, "l_fifo");
-  GtkWidget *Llbuffer = sc_grave_get_data(Ag, "l_buffer");
+  GtkWidget *Lpbfifo = sc_grave_get_widget(Ag, "pb_fifo");
+  GtkWidget *Lpbbuffer = sc_grave_get_widget(Ag, "pb_buffer");
+  GtkWidget *Llfifo = sc_grave_get_widget(Ag, "l_fifo");
+  GtkWidget *Llbuffer = sc_grave_get_widget(Ag, "l_buffer");
 
   gtk_widget_hide(Lpbfifo); 
   gtk_widget_hide(Llfifo); 
@@ -1104,14 +1106,23 @@
   gtk_window_set_transient_for(GTK_WINDOW(Lwindowburn), GTK_WINDOW(Lparent));
 
   /* barres de progression */
-  Lpbtotal = GTK_PROGRESS_BAR(sc_grave_get_widget(Ag, "pb_total"));
-  Lpbstep = GTK_PROGRESS_BAR(sc_grave_get_widget(Ag, "pb_step"));
+  Lpbtotal = GTK_PROGRESS_BAR(sc_grave_get_widget(Lburng, "pb_total"));
+  Lpbstep = GTK_PROGRESS_BAR(sc_grave_get_widget(Lburng, "pb_step"));
+
   /* pour la conversion des fichiers audio et la pulse bar */
-  sc_grave_set_data(Ag, Lpbstep, "progress");
-  Lpbfifo = GTK_PROGRESS_BAR(sc_grave_get_widget(Ag, "pb_fifo"));
-  Lpbbuffer = GTK_PROGRESS_BAR(sc_grave_get_widget(Ag, "pb_buffer"));
+  Lpbfifo = GTK_PROGRESS_BAR(sc_grave_get_widget(Lburng, "pb_fifo"));
+  Lpbbuffer = GTK_PROGRESS_BAR(sc_grave_get_widget(Lburng, "pb_buffer"));
+  Ltitle = GTK_LABEL(sc_grave_get_widget(Lburng, "gravetitle"));
 
   /* on attache les variables utilisees lors de l'operation */
+  sc_grave_set_data(Ag, Lwindowburn, "window_burn");
+  sc_grave_set_data(Ag, Ltitle, "gravetitle");
+  sc_grave_set_data(Ag, Lpbtotal, "pb_total");
+  sc_grave_set_data(Ag, Lpbstep, "pb_step");
+  sc_grave_set_data(Ag, Lpbstep, "progress");
+  sc_grave_set_data(Ag, Lpbfifo, "pb_fifo");
+  sc_grave_set_data(Ag, Lpbbuffer, "pb_buffer");
+  
   sc_grave_set_data(Ag, &Ltotaldone, "totaldone");
   sc_grave_set_data(Ag, &Labort, "gabort");  /* operation annulee par 
l'utilisateur ? */
   sc_grave_set_data(Ag, &Lpid, "pid");
@@ -1130,7 +1141,7 @@
   } else if (g_str_has_prefix(Aaction, "btnburndata")) {
     Lbackvalue = burn_data(Ag, &Lerror);
   } else if (g_str_has_prefix(Aaction, "btnburndvddata")) {
-    hide_some_progressbar(Ag);
+    hide_some_progressbar(Lburng);
     Lbackvalue = burn_dvddata(Ag, &Lerror);
   }
 
@@ -1139,7 +1150,6 @@
                                      GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, 
GTK_BUTTONS_OK,
                                      _("Operation aborted by user !"));
   } else {
-    Ltitle = GTK_LABEL(sc_grave_get_widget(Lburng, "gravetitle"));
     
     /* pour plus de beaute on s'assure que les barres de progression aient les 
bonnes
      * valeurs :-) */
@@ -1273,9 +1283,9 @@
 
     /* pointeur sur la liste courante pour plus de simplicite */
     if (!strcmp(Lident, "bodycddata")) {
-      sc_grave_replace_data(Lg, sc_grave_get_data(Lg, "LISTEDATA"), 
"_current_lisl");
+      sc_grave_replace_data(Lg, sc_grave_get_widget(Lg, "LISTEDATA"), 
"_current_list");
     } else if (!strcmp(Lident, "bodydvddata")) {
-      sc_grave_replace_data(Lg, sc_grave_get_data(Lg, "LISTEDVDDATA"), 
"_current_list");
+      sc_grave_replace_data(Lg, sc_grave_get_widget(Lg, "LISTEDVDDATA"), 
"_current_list");
     }
   }
   g_free(Lident);
@@ -1713,23 +1723,22 @@
   gtk_label_set_text(GTK_LABEL(sc_grave_get_widget(Lerasecdg, "labelava")), 
_("Erasing CD-RW in progress, please wait..."));
 
   
-  sc_grave_set_data(Lerasecdg, &Lcont, "cont");
-  sc_grave_set_data(Lerasecdg, &Lpid, "pid");
-  sc_grave_set_data(Lerasecdg, &Labort, "gabort");
-  sc_grave_set_data(Lerasecdg, &Lerror, "gerror");
-  sc_grave_set_data(Lerasecdg, &Loperationstatus, "operationstatus");
-  sc_grave_set_data(Lerasecdg, sc_grave_get_widget(Ag, "dstothercombo"), 
"dstothercombo");
-  sc_grave_set_data(Lerasecdg, sc_grave_get_widget(Ag, "usefastblank"), 
"usefastblank");
+  sc_grave_set_data(Ag, &Lcont, "cont");
+  sc_grave_set_data(Ag, &Lpid, "pid");
+  sc_grave_set_data(Ag, &Labort, "gabort");
+  sc_grave_set_data(Ag, &Lerror, "gerror");
+  sc_grave_set_data(Ag, sc_grave_get_widget(Lerasecdg, "progress"), 
"progress");
+  sc_grave_set_data(Ag, &Loperationstatus, "operationstatus");
 
   /* bouton annuler */
-  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lerasecdg, "cancelbtn")), 
"clicked", G_CALLBACK(abort_encours), Lerasecdg);
-  g_signal_connect(G_OBJECT(Lwin), "delete-event", 
G_CALLBACK(delete_event_encours), Lerasecdg);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lerasecdg, "cancelbtn")), 
"clicked", G_CALLBACK(abort_encours), Ag);
+  g_signal_connect(G_OBJECT(Lwin), "delete-event", 
G_CALLBACK(delete_event_encours), Ag);
 
   gtk_widget_show(Lwin);
-  g_timeout_add(500, encours_callback, Lerasecdg);
+  g_timeout_add(500, encours_callback, Ag);
 
   /* operation en elle meme */
-  perform_erase_cdrw(Lerasecdg, &Lerror);
+  perform_erase_cdrw(Ag, &Lerror);
   
   if (Labort) {
     Lstatusbox = gtk_message_dialog_new(GTK_WINDOW(Lwin),
@@ -1769,22 +1778,22 @@
   Lwin = sc_grave_get_widget(Lfixcdg, "window_inprogress"); 
   gtk_label_set_text(GTK_LABEL(sc_grave_get_widget(Lfixcdg, "labelava")), 
_("Fixating CD-R in progress, please wait..."));
   
-  sc_grave_set_data(Lfixcdg, &Lcont, "cont");
-  sc_grave_set_data(Lfixcdg, &Lpid, "pid");
-  sc_grave_set_data(Lfixcdg, &Labort, "gabort");
-  sc_grave_set_data(Lfixcdg, &Lerror, "gerror");
-  sc_grave_set_data(Lfixcdg, &Loperationstatus, "operationstatus");
-  sc_grave_set_data(Lfixcdg, sc_grave_get_widget(Ag, "dstothercombo"), 
"dstothercombo");
+  sc_grave_set_data(Ag, &Lcont, "cont");
+  sc_grave_set_data(Ag, &Lpid, "pid");
+  sc_grave_set_data(Ag, &Labort, "gabort");
+  sc_grave_set_data(Ag, &Lerror, "gerror");
+  sc_grave_set_data(Ag, sc_grave_get_widget(Lfixcdg, "progress"), "progress");
+  sc_grave_set_data(Ag, &Loperationstatus, "operationstatus");
 
   /* bouton annuler */
-  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lfixcdg, "cancelbtn")), 
"clicked", G_CALLBACK(abort_encours), Lfixcdg);
-  g_signal_connect(G_OBJECT(Lwin), "delete-event", 
G_CALLBACK(delete_event_encours), Lfixcdg);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lfixcdg, "cancelbtn")), 
"clicked", G_CALLBACK(abort_encours), Ag);
+  g_signal_connect(G_OBJECT(Lwin), "delete-event", 
G_CALLBACK(delete_event_encours), Ag);
 
   gtk_widget_show(Lwin);
-  g_timeout_add(500, encours_callback, Lfixcdg);
+  g_timeout_add(500, encours_callback, Ag);
 
   /* operation en elle meme */
-  perform_fix_cd(Lfixcdg, &Lerror);
+  perform_fix_cd(Ag, &Lerror);
   
   if (Labort) {
     Lstatusbox = gtk_message_dialog_new(GTK_WINDOW(Lwin),
@@ -1827,21 +1836,21 @@
   gtk_label_set_text(Llabel, Atitle);
 
   
-  sc_grave_set_data(Lformatdvdg, &Lcont, "cont");
-  sc_grave_set_data(Lformatdvdg, &Lpid, "pid");
-  sc_grave_set_data(Lformatdvdg, &Labort, "gabort");
-  sc_grave_set_data(Lformatdvdg, &Lerror, "gerror");
-  sc_grave_set_data(Lformatdvdg, &Loperationstatus, "operationstatus");
-  sc_grave_set_data(Lformatdvdg, sc_grave_get_widget(Ag, "dstothercombo"), 
"dstothercombo");
+  sc_grave_set_data(Ag, &Lcont, "cont");
+  sc_grave_set_data(Ag, &Lpid, "pid");
+  sc_grave_set_data(Ag, &Labort, "gabort");
+  sc_grave_set_data(Ag, &Lerror, "gerror");
+  sc_grave_set_data(Ag, sc_grave_get_widget(Lformatdvdg, "progress"), 
"progress");
+  sc_grave_set_data(Ag, &Loperationstatus, "operationstatus");
 
   /* bouton annuler */
-  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lformatdvdg, "cancelbtn")), 
"clicked", G_CALLBACK(abort_encours), Lformatdvdg);
-  g_signal_connect(G_OBJECT(Lwin), "delete-event", 
G_CALLBACK(delete_event_encours), Lformatdvdg);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lformatdvdg, "cancelbtn")), 
"clicked", G_CALLBACK(abort_encours), Ag);
+  g_signal_connect(G_OBJECT(Lwin), "delete-event", 
G_CALLBACK(delete_event_encours), Ag);
 
   gtk_widget_show(Lwin);
 
   /* operation en elle meme */
-  perform_format_dvd(Lformatdvdg, Aoperation, &Lerror);
+  perform_format_dvd(Ag, Aoperation, &Lerror);
   
   if (Labort) {
     Lstatusbox = gtk_message_dialog_new(GTK_WINDOW(Lwin),