4 files changed, 25 insertions, 15 deletions

diff --git a/firmware/export/id3.h b/firmware/export/id3.h
index 6e53e4c66c..10f8002db6 100644
--- a/firmware/export/id3.h
+++ b/firmware/export/id3.h
@@ -74,7 +74,7 @@ enum {
     ID3_VER_2_4
 };
 
-bool mp3info(struct mp3entry *entry, char *filename);
+bool mp3info(struct mp3entry *entry, char *filename, bool v1first);
 char* id3_get_genre(struct mp3entry* id3);
 
 #endif
diff --git a/firmware/export/mpeg.h b/firmware/export/mpeg.h
index 252e509c94..51932c5090 100644
--- a/firmware/export/mpeg.h
+++ b/firmware/export/mpeg.h
@@ -96,6 +96,7 @@ void mpeg_error_clear(void);
 /* in order to keep the recording here, I have to expose this */
 void rec_tick(void);
 void playback_tick(void); /* FixMe: get rid of this, use mp3_get_playtime() */
+void mpeg_id3_options(bool _v1first);
 
 #define MPEG_STATUS_PLAY 1
 #define MPEG_STATUS_PAUSE 2
diff --git a/firmware/id3.c b/firmware/id3.c
index 70add41b6b..03c37c027e 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -798,13 +798,12 @@ static int getsonglength(int fd, struct mp3entry *entry)
  * Checks all relevant information (such as ID3v1 tag, ID3v2 tag, length etc)
  * about an MP3 file and updates it's entry accordingly.
  *
- * Arguments: entry - the entry to check and update with the new information
- *
- * Returns: void
  */
-bool mp3info(struct mp3entry *entry, char *filename) 
+bool mp3info(struct mp3entry *entry, char *filename, bool v1first)
 {
     int fd;
+    int v1found = false;
+    
     fd = open(filename, O_RDONLY);
     if(-1 == fd)
         return true;
@@ -819,7 +818,10 @@ bool mp3info(struct mp3entry *entry, char *filename)
     entry->tracknum = 0;
     entry->genre = 0xff;
 
-    if (entry->id3v2len)
+    if(v1first)
+        v1found = setid3v1title(fd, entry);
+    
+    if (!v1found && entry->id3v2len)
         setid3v2title(fd, entry);
     entry->length = getsonglength(fd, entry);
 
@@ -827,10 +829,10 @@ bool mp3info(struct mp3entry *entry, char *filename)
        the true size of the MP3 stream */
     entry->filesize -= entry->first_frame_offset;
     
-    /* only seek to end of file if no id3v2 tags were found */
-    if (!entry->id3v2len) {
-        if(!entry->title)
-            setid3v1title(fd, entry);
+    /* only seek to end of file if no id3v2 tags were found,
+       and we already haven't looked for a v1 tag */
+    if (!v1first && !entry->id3v2len) {
+        setid3v1title(fd, entry);
     }
 
     close(fd);
@@ -860,7 +862,7 @@ int main(int argc, char **argv)
     for(i=1; i<argc; i++) {
         struct mp3entry mp3;
         mp3.album = "Bogus";
-        if(mp3info(&mp3, argv[i])) {
+        if(mp3info(&mp3, argv[i], false)) {
             printf("Failed to get %s\n", argv[i]);
             return 0;
         }
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 8f0612c693..a54866e0c2 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -107,6 +107,8 @@ struct id3tag
 static struct id3tag *id3tags[MAX_ID3_TAGS];
 static struct id3tag _id3tags[MAX_ID3_TAGS];
 
+static bool v1first = false;
+
 static unsigned int current_track_counter = 0;
 static unsigned int last_track_counter = 0;
 
@@ -736,7 +738,7 @@ static int add_track_to_tag_list(char *filename)
     {
         /* grab id3 tag of new file and
            remember where in memory it starts */
-        if(mp3info(&(t->id3), filename))
+        if(mp3info(&(t->id3), filename, v1first))
         {
             DEBUGF("Bad mp3\n");
             return -1;
@@ -1985,6 +1987,11 @@ static void mpeg_thread(void)
 static struct mp3entry taginfo;
 #endif /* #ifdef SIMULATOR */
 
+void mpeg_id3_options(bool _v1first)
+{
+   v1first = _v1first;
+}
+
 struct mp3entry* mpeg_current_track()
 {
 #ifdef SIMULATOR
@@ -2443,7 +2450,7 @@ void mpeg_play(int offset)
         trackname = playlist_peek( steps );
         if (!trackname)
             break;
-        if(mp3info(&taginfo, trackname)) {
+        if(mp3info(&taginfo, trackname, v1first)) {
             /* bad mp3, move on */
             if(++steps > playlist_amount())
                 break;
@@ -2518,7 +2525,7 @@ void mpeg_next(void)
         file = playlist_peek(steps);
         if(!file)
             break;
-        if(mp3info(&taginfo, file)) {
+        if(mp3info(&taginfo, file, v1first)) {
             if(++steps > playlist_amount())
                 break;
             continue;
@@ -2546,7 +2553,7 @@ void mpeg_prev(void)
         file = playlist_peek(steps);
         if(!file)
             break;
-        if(mp3info(&taginfo, file)) {
+        if(mp3info(&taginfo, file, v1first)) {
             steps--;
             continue;
         }