diff options
author | Nils Wallménius <nils@rockbox.org> | 2007-05-30 22:16:11 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2007-05-30 22:16:11 +0000 |
commit | 7956c92f92f8b130b633e6d062a61c07eebe6478 (patch) | |
tree | 35ff833f0b54b814be01432cb356accaabddb3e5 | |
parent | cd715d8468c272f7cd75538f509b89b17443545a (diff) | |
download | rockbox-7956c92f92f8b130b633e6d062a61c07eebe6478.tar.gz rockbox-7956c92f92f8b130b633e6d062a61c07eebe6478.zip |
Revert changes to id3.h, removing those members from the struct made binsize increase almost 1KB on some targets
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13528 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/export/id3.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/firmware/export/id3.h b/firmware/export/id3.h index 3306e7710d..5cc600face 100644 --- a/firmware/export/id3.h +++ b/firmware/export/id3.h | |||
@@ -166,21 +166,17 @@ struct mp3entry { | |||
166 | unsigned long length; /* song length in ms */ | 166 | unsigned long length; /* song length in ms */ |
167 | unsigned long elapsed; /* ms played */ | 167 | unsigned long elapsed; /* ms played */ |
168 | 168 | ||
169 | #if CONFIG_CODEC == SWCODEC | ||
170 | int lead_trim; /* Number of samples to skip at the beginning */ | 169 | int lead_trim; /* Number of samples to skip at the beginning */ |
171 | int tail_trim; /* Number of samples to remove from the end */ | 170 | int tail_trim; /* Number of samples to remove from the end */ |
172 | 171 | ||
173 | /* Added for Vorbis */ | 172 | /* Added for Vorbis */ |
174 | unsigned long samples; /* number of samples in track */ | 173 | unsigned long samples; /* number of samples in track */ |
175 | #endif | ||
176 | 174 | ||
177 | /* MP3 stream specific info */ | 175 | /* MP3 stream specific info */ |
178 | unsigned long frame_count; /* number of frames in the file (if VBR) */ | 176 | unsigned long frame_count; /* number of frames in the file (if VBR) */ |
179 | 177 | ||
180 | #if CONFIG_CODEC == SWCODEC | ||
181 | /* Used for A52/AC3 */ | 178 | /* Used for A52/AC3 */ |
182 | unsigned long bytesperframe; /* number of bytes per frame (if CBR) */ | 179 | unsigned long bytesperframe; /* number of bytes per frame (if CBR) */ |
183 | #endif | ||
184 | 180 | ||
185 | /* Xing VBR fields */ | 181 | /* Xing VBR fields */ |
186 | bool vbr; | 182 | bool vbr; |
@@ -195,6 +191,12 @@ struct mp3entry { | |||
195 | unsigned long offset; /* bytes played */ | 191 | unsigned long offset; /* bytes played */ |
196 | int index; /* playlist index */ | 192 | int index; /* playlist index */ |
197 | 193 | ||
194 | /* FileEntry fields */ | ||
195 | long fileentryoffset; | ||
196 | long filehash; | ||
197 | long songentryoffset; | ||
198 | long rundbentryoffset; | ||
199 | |||
198 | /* runtime database fields */ | 200 | /* runtime database fields */ |
199 | short rating; | 201 | short rating; |
200 | short score; | 202 | short score; |