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

[sylvain cresto]

Index: graveman/current/src/callbacks.c
diff -u graveman/current/src/callbacks.c:1.22 
graveman/current/src/callbacks.c:1.23
--- graveman/current/src/callbacks.c:1.22       Mon Feb 21 23:54:28 2005
+++ graveman/current/src/callbacks.c    Sat Feb 26 12:23:36 2005
@@ -1372,7 +1372,7 @@
   Tgrave *Lg = (Tgrave *)Adata;
   GtkProgressBar *Lprog = GTK_PROGRESS_BAR(sc_grave_get_data(Lg, "progress"));
   gint *Lcont = (gint *)sc_grave_get_data(Lg, "cont");
-printf("toto ici\n");
+
   gtk_progress_bar_pulse(Lprog);
 
   if ((*Lcont) == 1) (*Lcont) = 0;
@@ -1412,7 +1412,7 @@
   gboolean Labort = FALSE;
   gint Lcont = 2;
   gchar *Ltxt;
-  GSList *Lcur;
+  GSList *Lcur, *Lnext;
   Tdriveinfo *Ldrive;
   guint Ltimeout;
   
@@ -1420,9 +1420,10 @@
 
   sc_grave_set_data(Lg, &Lcont, "cont");
   sc_grave_set_data(Lg, &Labort, "gabort");
+  sc_grave_set_data(Lg, sc_grave_get_widget(Lg, "progress"), "progress");
 
   /* bouton annuler */
-  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "cancelbt")), "clicked", 
G_CALLBACK(abort_encours), (GtkWidget *)Lg);
+  g_signal_connect(G_OBJECT(sc_grave_get_widget(Lg, "cancelbtn")), "clicked", 
G_CALLBACK(abort_encours), (GtkWidget *)Lg);
 
   gtk_widget_show(Lwin);
   Ltimeout = g_timeout_add(500, encours_callback, Lg);
@@ -1430,7 +1431,7 @@
   scan_for_drives(Lg, NULL);
 
   if (Labort == FALSE) {
-    for (Lcur = Glistdrives; Lcur; Lcur = g_slist_next(Lcur)) {
+    for (Lcur = Glistdrives; Lcur; Lcur = Lcur ? g_slist_next(Lcur) : Lnext) {
       Ldrive = (Tdriveinfo *)Lcur->data;
       if (g_slist_length(Ldrive->dev)>0) {
         Ltxt = g_strdup_printf(_("Scanning drive \"%s\"..."), Ldrive->name);
@@ -1438,6 +1439,14 @@
         while(gtk_events_pending()) gtk_main_iteration();
 
         maj_drive_info(Ldrive, (gchar *)g_slist_nth_data(Ldrive->dev, 0), 
NULL);
+
+        /* on n'ajoute que les lecteurs/graveurs */
+        if (Ldrive->type == 0) {
+_DEB("le type == %d = %s\n", Ldrive->type, Ldrive->name);
+          Lnext = g_slist_next(Lcur);
+          Glistdrives = g_slist_delete_link(Glistdrives, Lcur);
+          Lcur = NULL;
+        }
       }
     }
   }
@@ -1754,11 +1763,14 @@
 void menu_load(GtkMenuItem *Amenuitem, gpointer Adata)
 {
   Tgrave *Lg = (Tgrave *)Adata;
-  GtkWidget *Lfileselection;
   GtkFileFilter *filterm3u, *filterpts, *filterall;
   GtkWidget *Lparent = sc_grave_get_widget(Lg, "topwindow");
-  gint Lresp;
+  guint32 *Laudiolen = (guint32 *)sc_grave_get_data(Lg, "audiolen");
+  guint32 *Laudiomaxlen = (guint32 *)sc_grave_get_data(Lg, "audiomaxlen");
+  GtkProgressBar *Lcontenance = GTK_PROGRESS_BAR(sc_grave_get_widget(Lg, 
"audiolenbar"));
   GError *Lerror = NULL;
+  GtkWidget *Lfileselection;
+  gint Lresp;
   gboolean LnewPl = (strcmp(glade_get_widget_name(GTK_WIDGET(Amenuitem)), 
"popupaudio_append"));
   
   /* filtres pour la selection de fichiers */
@@ -1818,6 +1830,7 @@
   }
 
   gtk_widget_destroy(Lfileselection);
+  switch_pbar_status(Lcontenance, *Laudiomaxlen, *Laudiolen, PB_UPDATE_AUDIO);
 }
 
 /* debuter un nouveau projet */