fix for CDROM_GetLabel for mixed-mode cdrom

Enrico Horn farmboy1 at subdimension.com
Sat Mar 1 19:13:25 CST 2003


This patch has been tested against Final Fantasy VII
which now finds the game cds

Changelog:
    Simple way to get the label of mixed-mode cd

Index: files/drive.c
===================================================================
RCS file: /home/wine/wine/files/drive.c,v
retrieving revision 1.84
diff -u -r1.84 drive.c
--- files/drive.c	24 Jan 2003 00:54:58 -0000	1.84
+++ files/drive.c	2 Mar 2003 00:04:29 -0000
@@ -820,8 +820,13 @@
         break;
     }
     case CDROM_DISK_DATA_TRACK|CDROM_DISK_AUDIO_TRACK:
-        FIXME("Need to get the label of a mixed mode CD: not implemented yet !\n");
-        /* fall through */
+        FIXME("Need to get the label of a mixed mode CD!\n");
+	/* This assumes that the first track is a data track! */
+	/* I guess the correct way would be to enumerate all data tracks
+	   and check each for the title */
+        if (!CDROM_Data_GetLabel(drive, label))
+            ret = 0;
+        break;
     case 0:
         ret = 0;
         break;





More information about the wine-patches mailing list