diff options
Diffstat (limited to 'firmware/export/id3.h')
-rw-r--r-- | firmware/export/id3.h | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/firmware/export/id3.h b/firmware/export/id3.h index 6c6507159a..47a084d67a 100644 --- a/firmware/export/id3.h +++ b/firmware/export/id3.h | |||
@@ -61,39 +61,37 @@ struct mp3entry { | |||
61 | unsigned char genre; | 61 | unsigned char genre; |
62 | unsigned int codectype; | 62 | unsigned int codectype; |
63 | unsigned int bitrate; | 63 | unsigned int bitrate; |
64 | unsigned int frequency; | 64 | unsigned long frequency; |
65 | unsigned int id3v2len; | 65 | unsigned long id3v2len; |
66 | unsigned int id3v1len; | 66 | unsigned long id3v1len; |
67 | unsigned int first_frame_offset; /* Byte offset to first real MP3 frame. | 67 | unsigned long first_frame_offset; /* Byte offset to first real MP3 frame. |
68 | Used for skipping leading garbage to | 68 | Used for skipping leading garbage to |
69 | avoid gaps between tracks. */ | 69 | avoid gaps between tracks. */ |
70 | unsigned int vbr_header_pos; | 70 | unsigned long vbr_header_pos; |
71 | unsigned int filesize; /* in bytes */ | 71 | unsigned long filesize; /* without headers; in bytes */ |
72 | unsigned int length; /* song length */ | 72 | unsigned long length; /* song length in ms */ |
73 | unsigned int elapsed; /* ms played */ | 73 | unsigned long elapsed; /* ms played */ |
74 | 74 | ||
75 | int lead_trim; /* Number of samples to skip at the beginning */ | 75 | int lead_trim; /* Number of samples to skip at the beginning */ |
76 | int tail_trim; /* Number of samples to remove from the end */ | 76 | int tail_trim; /* Number of samples to remove from the end */ |
77 | 77 | ||
78 | /* Added for Vorbis */ | 78 | /* Added for Vorbis */ |
79 | unsigned long samples; /* number of samples in track */ | 79 | unsigned long samples; /* number of samples in track */ |
80 | 80 | ||
81 | /* MP3 stream specific info */ | 81 | /* MP3 stream specific info */ |
82 | long bpf; /* bytes per frame */ | 82 | unsigned long frame_count; /* number of frames in the file (if VBR) */ |
83 | long tpf; /* time per frame */ | ||
84 | long frame_count; /* number of frames in the file (if VBR) */ | ||
85 | 83 | ||
86 | /* Xing VBR fields */ | 84 | /* Xing VBR fields */ |
87 | bool vbr; | 85 | bool vbr; |
88 | bool has_toc; /* True if there is a VBR header in the file */ | 86 | bool has_toc; /* True if there is a VBR header in the file */ |
89 | unsigned char toc[100];/* table of contents */ | 87 | unsigned char toc[100]; /* table of contents */ |
90 | 88 | ||
91 | /* these following two fields are used for local buffering */ | 89 | /* these following two fields are used for local buffering */ |
92 | char id3v2buf[300]; | 90 | char id3v2buf[300]; |
93 | char id3v1buf[3][32]; | 91 | char id3v1buf[3][32]; |
94 | 92 | ||
95 | /* resume related */ | 93 | /* resume related */ |
96 | int offset; /* bytes played */ | 94 | unsigned long offset; /* bytes played */ |
97 | int index; /* playlist index */ | 95 | int index; /* playlist index */ |
98 | 96 | ||
99 | /* FileEntry fields */ | 97 | /* FileEntry fields */ |