Modified AudioFileSource ID3 to enable tag skipping.

src/AudioFileSourceFS.h

@@ -29,8 +29,8 @@
 class AudioFileSourceFS : public AudioFileSource
 {
   public:
-    AudioFileSourceFS(FS &fs) { filesystem = &fs; }
-    AudioFileSourceFS(FS &fs, const char *filename);
+    AudioFileSourceFS(fs::FS &fs) { filesystem = &fs; }
+    AudioFileSourceFS(fs::FS &fs, const char *filename);
     virtual ~AudioFileSourceFS() override;
 
     virtual bool open(const char *filename) override;
@@ -42,8 +42,8 @@ class AudioFileSourceFS : public AudioFileSource
     virtual uint32_t getPos() override { if (!f) return 0; else return f.position(); };
 
   private:
-    FS *filesystem;
-    File f;
+    fs::FS *filesystem;
+    fs::File f;
 };
 
 

src/AudioFileSourceID3.cpp

@@ -117,10 +117,11 @@ bool AudioFileSourceUnsync::eof()
 
 
 
-AudioFileSourceID3::AudioFileSourceID3(AudioFileSource *src)
+AudioFileSourceID3::AudioFileSourceID3(AudioFileSource *src, bool skip)
 {
   this->src = src;
   this->checked = false;
+  this->skip = skip;
 }
 
 AudioFileSourceID3::~AudioFileSourceID3()
@@ -143,6 +144,7 @@ uint32_t AudioFileSourceID3::read(void *data, uint32_t len)
   if (ret<10) return ret;
 
   if ((buff[0]!='I') || (buff[1]!='D') || (buff[2]!='3') || (buff[3]>0x04) || (buff[3]<0x02) || (buff[4]!=0)) {
+    cb.md("eof", false, "id3");
     return 10 + src->read(buff+10, len-10);
   }
 
@@ -169,6 +171,13 @@ uint32_t AudioFileSourceID3::read(void *data, uint32_t len)
   id3Size |= buff[8];
   id3Size = id3Size << 7;
   id3Size |= buff[9];
+
+  // Return now to the player if we want to skip ID3 parsing.
+  if(skip){
+    // Advance to the end of ID3 tag
+    src->seek(id3Size + 10, 0);
+    return src->read(data, len);
+  }
   // Every read from now may be unsync'd
   AudioFileSourceUnsync id3(src, id3Size, unsync);
 
@@ -212,7 +221,7 @@ uint32_t AudioFileSourceID3::read(void *data, uint32_t len)
 
       // Read the value and send to callback
       char value[64];
-      uint16_t i;
+      uint32_t i;
       bool isUnicode = (id3.getByte()==1) ? true : false;
       for (i=0; i<framesize-1; i++) {
         if (i<sizeof(value)-1) value[i] = id3.getByte();
@@ -231,10 +240,24 @@ uint32_t AudioFileSourceID3::read(void *data, uint32_t len)
       } else if ( (frameid[0]=='T' && frameid[1]=='Y' && frameid[2]=='E' && frameid[3] == 'R') ||
                   (frameid[0]=='T' && frameid[1]=='Y' && frameid[2]=='E' && rev==2) ) {
         cb.md("Year", isUnicode, value);
+      } else if ( (frameid[0]=='T' && frameid[1]=='R' && frameid[2]=='C' && frameid[3] == 'K') ||
+                  (frameid[0]=='T' && frameid[1]=='R' && frameid[2]=='K' && rev==2) ) {
+        cb.md("Track", isUnicode, value);
+      } else if ( (frameid[0]=='T' && frameid[1]=='P' && frameid[2]=='O' && frameid[3] == 'S') ||
+                  (frameid[0]=='T' && frameid[1]=='P' && frameid[2]=='A' && rev==2) ) {
+        cb.md("Set", isUnicode, value);
+      } else if ( (frameid[0]=='P' && frameid[1]=='O' && frameid[2]=='P' && frameid[3] == 'M') ||
+                  (frameid[0]=='P' && frameid[1]=='O' && frameid[2]=='P' && rev==2) ) {
+        cb.md("Popularimeter", isUnicode, value);
+      } else if ( (frameid[0]=='T' && frameid[1]=='C' && frameid[2]=='M' && frameid[3] == 'P') ) {
+        cb.md("Compilation", isUnicode, value);
       }
     }
   } while (!id3.eof());
 
+  // use callback function to signal end of tags and beginning of content.
+  cb.md("eof", false, "id3");
+
   // All ID3 processing done, return to main caller
   return src->read(data, len);
 }

src/AudioFileSourceID3.h

@@ -28,7 +28,7 @@
 class AudioFileSourceID3 : public AudioFileSource
 {
   public:
-    AudioFileSourceID3(AudioFileSource *src);
+    AudioFileSourceID3(AudioFileSource *src, bool skip = false);
     virtual ~AudioFileSourceID3() override;
 
     virtual uint32_t read(void *data, uint32_t len) override;
@@ -41,6 +41,7 @@ class AudioFileSourceID3 : public AudioFileSource
   private:
     AudioFileSource *src;
     bool checked;
+    bool skip;
 };