[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.4 graveman/current/src/cdrdao.c:1.5
--- graveman/current/src/cdrdao.c:1.4   Mon Feb 28 01:28:09 2005
+++ graveman/current/src/cdrdao.c       Wed Mar  2 00:19:58 2005
@@ -55,9 +55,11 @@
 
 /* detection des media */
 #define CDRDAO_CDRW "CD-RW"
-#define CDRDAO_YES "yes"
+#define CDRDAO_YES ": yes"
+#define CDRDAO_NO ": no"
 #define CDRDAO_CDR "CD-R medium"
 #define CDRDAO_EMPTY "CD-R empty"
+#define CDRDAO_APPENDABLE "Appendable"
 
 static gchar *get_blank_type(Tgrave *Ag)
 {
@@ -476,30 +478,37 @@
 
   g_snprintf(Lcommandline, sizeof(Lcommandline)-1, "%s disk-info --device %s", 
conf_get_string("cdrdao"), Adevice);
 
+  printf("cmd %s\n", Lcommandline);
   Lstatus = g_spawn_command_line_sync(Lcommandline, &Lout, &Lerr, &Lexit, 
Aerror);
 
+printf("apres => %d\n%s\n", Lstatus, Lout);
   if (Lstatus == FALSE || Lexit != 0) {
     g_free(Lout); g_free(Lerr);
-    return FALSE;
+    return 0;
   }
 
   Larrbuf = g_strsplit(Lout, "\n", 0);
 
   for (i=0; Larrbuf[i]; i++) {
     if (!*Larrbuf[i]) continue;
-
     if (!strncmp(Larrbuf[i], CDRDAO_CDRW, strlen(CDRDAO_CDRW))) {
       if (strstr(Larrbuf[i], CDRDAO_YES)) {
-printf("ok c'est un CDRW ! \n");        
-        Llu |= _MEDIA_CDRW;
+        Llu += _MEDIA_CDRW;
       }
     } else if (!strncmp(Larrbuf[i], CDRDAO_CDR, strlen(CDRDAO_CDR))) {
-      if (strstr(Larrbuf[i], CDRDAO_YES)) {
-printf("ok c'est un CDR ! \n");        
-        Llu |= _MEDIA_CDR;
+      if (!strstr(Larrbuf[i], CDRDAO_NO)) {
+        Llu += _MEDIA_CDR;
       }
     } else if (!strncmp(Larrbuf[i], CDRDAO_EMPTY, strlen(CDRDAO_EMPTY))) {
-      if (strstr(Larrbuf[i], CDRDAO_YES)) Llu &= _MEDIA_BLANK;
+      if (strstr(Larrbuf[i], CDRDAO_YES)) {
+        Llu += _MEDIA_BLANK;
+      } else {
+        Llu += _MEDIA_NOBLANK;
+      }
+    } else if (!strncmp(Larrbuf[i], CDRDAO_APPENDABLE, 
strlen(CDRDAO_APPENDABLE))) {
+      if (!strstr(Larrbuf[i], CDRDAO_NO)) {
+        Llu += _MEDIA_APPENDABLE;
+      }
     }
   }