[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.20 graveman/current/src/matos.c:1.21
--- graveman/current/src/matos.c:1.20   Fri Mar  4 01:16:38 2005
+++ graveman/current/src/matos.c        Fri Mar 11 23:31:13 2005
@@ -560,7 +560,9 @@
 
   *Ltitle=0;
   *Lcd = 0;
-  if (Atypecd & _MEDIA_CDR) {
+  if (Atypecd & _MEDIA_BLANKORAPPENDABLE) {
+    g_snprintf(Lcd, sizeof(Lcd)-1, _("a CDR/RW"));
+  } else if (Atypecd & _MEDIA_CDR) {
     g_snprintf(Lcd, sizeof(Lcd)-1, _("a CDR"));
   } else if (Atypecd & _MEDIA_CDRW) {
     g_snprintf(Lcd, sizeof(Lcd)-1, _("a CDRW"));
@@ -611,24 +613,17 @@
     Lmedialu = 0;
     
     if (*Lrequis & _MEDIA_IS_DVD) {
-printf("test DVD!\n"); 
       Lmedialu += get_dvdinfo(Ldrive, NULL);
-printf("fin => %d\n", Lmedialu);      
     }
 
     if (*Lrequis & _MEDIA_IS_CD) {
-printf("test CD!\n"); 
       Lmedialu += get_cdinfo(Ldrive, NULL);
-printf("fin => %d\n", Lmedialu);      
-      
     }
-printf("cdoudvd => %d\n", (!(_MEDIA_CMP_CD(*Lrequis, Lmedialu) || 
_MEDIA_CMP_DVD(*Lrequis, Lmedialu))));
-printf("blank = >%d\n", ((*Lrequis & _MEDIA_BLANK) && (Lmedialu & 
_MEDIA_NOBLANK)));
-printf("nobliank => %d\n", ((*Lrequis & _MEDIA_NOBLANK) && (Lmedialu & 
_MEDIA_BLANK)));
-printf("apprend => %d\n", ((*Lrequis & _MEDIA_APPENDABLE) && (!(Lmedialu & 
_MEDIA_APPENDABLE))));
 
     if (Ldetect) *Ldetect = Lmedialu;
     Lstatusmedia = (!(_MEDIA_CMP_CD(*Lrequis, Lmedialu) || 
_MEDIA_CMP_DVD(*Lrequis, Lmedialu))) ||
+                    ((*Lrequis & _MEDIA_BLANKORAPPENDABLE) &&
+                        ((!(Lmedialu  & _MEDIA_BLANK)) && (!(Lmedialu & 
_MEDIA_APPENDABLE)))) ||
                      ((*Lrequis & _MEDIA_BLANK) && (Lmedialu & 
_MEDIA_NOBLANK)) ||
                      ((*Lrequis & _MEDIA_NOBLANK) && (Lmedialu & 
_MEDIA_BLANK)) ||
                      ((*Lrequis & _MEDIA_APPENDABLE) && (!(Lmedialu & 
_MEDIA_APPENDABLE)));
@@ -642,9 +637,8 @@
   return TRUE;
 }
 
-
-gboolean waiting_for_user(Tgrave *Ag, gint Atypecd1, gint *Adetectcd1, gchar 
*Ldriveident1,
-                                      gint Atypecd2, gint *Adetectcd2, gchar 
*Ldriveident2)
+/* attente que l'utilisateur ai bien entre un cd */
+gboolean waiting_for_user(gchar *Atitle, Tgrave *Ag, gint Atypecd1, gint 
*Adetectcd1, gchar *Ldriveident1)
 {
   Tgrave *Lwaitg = sc_grave_load("window_waiting_cd.glade");
   GtkWidget *Lparent = sc_grave_get_widget(Ag, "topwindow");
@@ -680,21 +674,6 @@
       set_waitwindow_title(TRUE, Atypecd1, 1, Lwaitg);
     }
   }
-  if (Ldriveident2 && *Ldriveident2 && Atypecd2 != _MEDIA_NONE) {
-    GtkComboBox *Lcombob2 = GTK_COMBO_BOX(sc_grave_get_widget(Ag, 
Ldriveident2));
-    GtkTreeModel *Lmodelb2 = gtk_combo_box_get_model(Lcombob2);
-    if (gtk_combo_box_get_active_iter(Lcombob2, &Liter)) {
-      gtk_tree_model_get(Lmodelb2, &Liter, 0, &Lident2, 2, &Ldevicetitle2, -1);
-
-      sc_grave_set_data(Lwaitg, Lident2, "device2");
-      sc_grave_set_data(Lwaitg, Adetectcd2, "detect2");
-      sc_grave_set_data(Lwaitg, Ldevicetitle1, "devicetitle2");
-      sc_grave_set_data(Lwaitg, &Atypecd2, "devicerequis2");
-
-      set_waitwindow_title(TRUE, Atypecd2, 2, Lwaitg); //Atypecd2, 
Ldevicetitle2);
-      gtk_label_set_text(GTK_LABEL(sc_grave_get_widget(Lwaitg, "label2")), 
Ltitle);
-    }
-  }
 
   gtk_window_set_transient_for(GTK_WINDOW(Lwindow), GTK_WINDOW(Lparent));
   gtk_window_set_position(GTK_WINDOW(Lwindow), GTK_WIN_POS_CENTER_ALWAYS);
@@ -730,7 +709,6 @@
 {
   gboolean Lstatus = FALSE;
   gchar *Liso = get_combo_value(sc_grave_get_widget(Ag, Aname));
-printf("=%s= iso? %s\n", Aname, Liso);
   Lstatus = !strcmp(Liso, "iso");
 
   return Lstatus;