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

[sylvain cresto]

Index: graveman/current/src/matos.c
diff -u graveman/current/src/matos.c:1.17 graveman/current/src/matos.c:1.18
--- graveman/current/src/matos.c:1.17   Sat Feb 26 12:23:36 2005
+++ graveman/current/src/matos.c        Mon Feb 28 01:28:09 2005
@@ -556,38 +556,68 @@
 {
   Tgrave *Lg = (Tgrave *)Adata;
   gint *Lcont = (gint *)sc_grave_get_data(Lg, "cont");
-
+  gchar *Ldrive;
+  gint *Lrequis;
+  gint Lmedia;
+  gint i;
+  
+  for (i=1; 1; i++) {
+    Ldrive = sc_grave_get_datav(Lg, "device%d", i);
+    if (!Ldrive) break;
+      
+    Lrequis = (gint *) sc_grave_get_datav(Lg, "devicesrequis%d", i);
+
+    if (*Lrequis | _MEDIA_IS_CD) {
+   printf("oui on interroge le lecteur dvd\n");
+      Lmedia = get_dvdinfo(Ldrive, NULL);
+  printf("===%d\n", Lmedia);
+
+    }
+
+    if (*Lrequis | _MEDIA_IS_DVD) {
+   printf("oui on interroge le lecteur cd\n");
+      Lmedia = get_cdinfo(Ldrive, NULL);
+  printf("===%d\n", Lmedia);
+    }
+    
+  }
+    
   return TRUE;
 }
 
-gboolean waiting_for_user(Tgrave *Ag, gint Atypecd, gchar *Ldriveident1, gint 
Ld1requis, gchar *Ldriveident2, gint Ld2requis)
+gboolean waiting_for_user(Tgrave *Ag, gint Atypecd1, gchar *Ldriveident1, gint 
Atypecd2, gchar *Ldriveident2)
 {
   Tgrave *Lwaitg = sc_grave_load("window_waiting_cd.glade");
-  GtkWidget *Lparent = sc_grave_get_widget(Lwaitg, "topwindow");
+  GtkWidget *Lparent = sc_grave_get_widget(Ag, "topwindow");
   GtkWidget *Lwindow;
+  gchar *Lident;
   gboolean Lcont = TRUE;
   guint Ltimeout;
-
+printf("toto deb\n");
   g_assert(Lwaitg);
-
+  
   Lwindow = GTK_WIDGET(sc_grave_get_widget(Lwaitg, "window_waiting_cd"));
 
   sc_grave_set_data(Lwaitg, Lwindow, "window");
   sc_grave_set_data(Lwaitg, &Lcont, "cont");
 
   if (Ldriveident1) {
-    sc_grave_set_data(Lwaitg, Ldriveident1, "device1");
-    sc_grave_set_data(Lwaitg, &Ld1requis, "devicesrequis1");
+    Lident = get_combo_value(sc_grave_get_widget(Ag, Ldriveident1));
+    sc_grave_set_data(Lwaitg, Lident, "device1");
+    sc_grave_set_data(Lwaitg, &Atypecd1, "devicesrequis1");
   }
   if (Ldriveident2) {
-    sc_grave_set_data(Lwaitg, Ldriveident2, "device2");
-    sc_grave_set_data(Lwaitg, &Ld2requis, "devicesrequis2");
+    Lident = get_combo_value(sc_grave_get_widget(Ag, Ldriveident2));
+    sc_grave_set_data(Lwaitg, Lident, "device2");
+    sc_grave_set_data(Lwaitg, &Atypecd2, "devicesrequis2");
   }
- 
+printf("yopla = 1\n");
   gtk_window_set_transient_for(GTK_WINDOW(Lwindow), GTK_WINDOW(Lparent));
 
+printf("yopla = 2\n");
   gtk_widget_show(Lwindow);
 
+printf("yopla = 3\n");
   Ltimeout = g_timeout_add(1500, callback_waiting_for_user, Lwaitg);
   while (Lcont == TRUE) {
     gtk_main_iteration();