From c644fc29563c3e970274471142773f403c608057 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Fri, 5 Jul 2002 07:13:43 +0000 Subject: Added a vbr flag in the id3 struct git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1339 a1c6a512-1295-4272-9138-f99709370657 --- firmware/id3.c | 4 +++- firmware/id3.h | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/firmware/id3.c b/firmware/id3.c index b101aee407..b363adc0dd 100644 --- a/firmware/id3.c +++ b/firmware/id3.c @@ -490,13 +490,15 @@ static int getsonglength(int fd, struct mp3entry *entry) frame[34] == 'n' && frame[35] == 'g') { + /* Yes, it is a VBR file */ + entry->vbr = true; + if(frame[39] & 0x01) /* Is the frame count there? */ { framecount = (frame[40] << 24) | (frame[41] << 16) | (frame[42] << 8) | frame[43]; filetime = framecount * tpf; - entry->bitrate = VARIABLE_BIT_RATE; } /* We don't care about the file size and the TOC just yet. Maybe another time. */ diff --git a/firmware/id3.h b/firmware/id3.h index 60f660588f..9c8b5663a9 100644 --- a/firmware/id3.h +++ b/firmware/id3.h @@ -19,8 +19,6 @@ #ifndef ID3_H #define ID3_H -#define VARIABLE_BIT_RATE 1 - struct mp3entry { char path[256]; char *title; @@ -29,6 +27,7 @@ struct mp3entry { int tracknum; int version; int layer; + bool vbr; unsigned int bitrate; unsigned int frequency; unsigned int id3v2len; -- cgit v1.2.3