Index: id3.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/id3.c,v
retrieving revision 1.48
diff -u -3 -r1.48 id3.c
--- id3.c	19 Sep 2002 09:03:16 -0000	1.48
+++ id3.c	22 Sep 2002 19:45:32 -0000
@@ -665,6 +665,13 @@
            invalid mp3 and won't be played by us! */
         return true;
 
+    /* Lets see if there is a cuefile */
+    if (read_cuefile(&(entry->cuefile), filename)==0) {
+        entry->has_cuefile=true;
+    } else {
+        entry->has_cuefile=false;
+    }
+
     return false;
 }
 
Index: id3.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/id3.h,v
retrieving revision 1.14
diff -u -3 -r1.14 id3.h
--- id3.h	16 Aug 2002 14:41:47 -0000	1.14
+++ id3.h	22 Sep 2002 19:45:33 -0000
@@ -20,6 +20,7 @@
 #define ID3_H
 
 #include "file.h"
+#include "cuefile.h"
 
 struct mp3entry {
     char path[MAX_PATH];
@@ -43,6 +44,10 @@
     bool vbr;
     unsigned char vbrflags;
     unsigned char toc[100];/* table of contents */
+
+    /* Cuefile fields */
+    bool has_cuefile;
+    struct cuefile_t cuefile;
 
     /* these following two fields are used for local buffering */
     char id3v2buf[300];
Index: mpeg.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/mpeg.c,v
retrieving revision 1.127
diff -u -3 -r1.127 mpeg.c
--- mpeg.c	18 Sep 2002 13:51:08 -0000	1.127
+++ mpeg.c	22 Sep 2002 19:45:42 -0000
@@ -155,7 +155,7 @@
 }
 
 /* list of tracks in memory */
-#define MAX_ID3_TAGS (1<<4) /* Must be power of 2 */
+#define MAX_ID3_TAGS (1<<2) /* Must be power of 2 */
 #define MAX_ID3_TAGS_MASK (MAX_ID3_TAGS - 1)
 
 struct id3tag