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

[sylvain cresto]

Index: graveman/current/src/cdrdao.c
diff -u graveman/current/src/cdrdao.c:1.5 graveman/current/src/cdrdao.c:1.6
--- graveman/current/src/cdrdao.c:1.5   Wed Mar  2 00:19:58 2005
+++ graveman/current/src/cdrdao.c       Fri Mar  4 01:16:38 2005
@@ -59,7 +59,10 @@
 #define CDRDAO_NO ": no"
 #define CDRDAO_CDR "CD-R medium"
 #define CDRDAO_EMPTY "CD-R empty"
+#define CDRDAO_TOCTYPE "Toc Type"
 #define CDRDAO_APPENDABLE "Appendable"
+#define CDRDAO_NA ": n/a"
+#define CDRDAO_CD "CD"
 
 static gchar *get_blank_type(Tgrave *Ag)
 {
@@ -154,7 +157,7 @@
         g_snprintf(Lsbuf, sizeof(Lsbuf)-1, _("Writing track %s - %.0f MB of 
%.0f MB at %s"),
             Llasttrack, Lde, La, Latspeed);
         gtk_label_set_text(Ltitle, Lsbuf);
-printf("ici Ltodo = %d done = %d\n", *Ltodo, *Ldone);
+
         Lpct = POURCENT(La, Lde);
         maj_progress(Lprogressbar2, Lpct);
 
@@ -495,8 +498,12 @@
       if (strstr(Larrbuf[i], CDRDAO_YES)) {
         Llu += _MEDIA_CDRW;
       }
+    } else if (!strncmp(Larrbuf[i], CDRDAO_TOCTYPE, strlen(CDRDAO_TOCTYPE))) {
+      if (strstr(Larrbuf[i], CDRDAO_CD)) {
+        Llu += _MEDIA_CD;
+      }
     } else if (!strncmp(Larrbuf[i], CDRDAO_CDR, strlen(CDRDAO_CDR))) {
-      if (!strstr(Larrbuf[i], CDRDAO_NO)) {
+      if (!strstr(Larrbuf[i], CDRDAO_NA)) {
         Llu += _MEDIA_CDR;
       }
     } else if (!strncmp(Larrbuf[i], CDRDAO_EMPTY, strlen(CDRDAO_EMPTY))) {