/*
- * Copyright (C) 2003-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2003-2008 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
};
struct mp3info {
- struct mp3header header;
int id3_isvalid;
struct id3tag id3;
int vbr;
+ header->padding;
}
-static void write_info_str(struct afh_info *afhi)
+static void write_info_str(struct afh_info *afhi, struct mp3header *header)
{
int v = mp3.id3_isvalid;
- snprintf(afhi->info_string, MMD_INFO_SIZE,
+ afhi->info_string = make_message(
"%s: %cbr, %s\n" /* audio file info*/
"%s: %s, by %s\n" /* taginfo1 */
"%s: A: %s, Y: %s, C: %s\n", /* taginfo 2*/
status_item_list[SI_AUDIO_FILE_INFO], mp3.vbr? 'v' : 'c',
- header_mode(&mp3.header),
- status_item_list[SI_TAG_INFO1], v && *mp3.id3.title?
+ header_mode(header),
+ status_item_list[SI_TAGINFO1], v && *mp3.id3.title?
mp3.id3.title : "(title tag not set)",
v && *mp3.id3.artist?
mp3.id3.artist : "(artist tag not set)",
- status_item_list[SI_TAG_INFO2],
+ status_item_list[SI_TAGINFO2],
v && *mp3.id3.album?
mp3.id3.album : "(album tag not set)",
v && *mp3.id3.year? mp3.id3.year : "????",
static char *unpad(char *string)
{
char *pos = string + strlen(string) - 1;
- while (isspace(pos[0]))
+ while (para_isspace(pos[0]))
(pos--)[0] = 0;
return string;
}
* Return the length of the next frame header or zero if the end of the file is
* reached.
*/
-static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos)
+static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos,
+ struct mp3header *result)
{
int k, l = 0, first_len;
struct mp3header h, h2;
}
if (k == MIN_CONSEC_GOOD_FRAMES) {
*fpos = valid_start;
- memcpy(&(mp3.header), &h2, sizeof(struct mp3header));
+ *result = h2;
return first_len;
}
}
return 0;
}
-static void mp3_get_id3(unsigned char *map, size_t numbytes, off_t *fpos)
+static void mp3_get_id3(unsigned char *map, size_t numbytes)
{
+ off_t fpos;
+
mp3.id3_isvalid = 0;
mp3.id3.title[0] = '\0';
mp3.id3.artist[0] = '\0';
mp3.id3.year[0] = '\0';
if (numbytes < 128)
return;
- *fpos = numbytes - 128;
- if (strncmp("TAG", (char *) map + *fpos, 3)) {
- PARA_DEBUG_LOG("%s", "no id3 tag\n");
+ fpos = numbytes - 128;
+ if (strncmp("TAG", (char *) map + fpos, 3)) {
+ PARA_DEBUG_LOG("no id3 tag\n");
return;
}
- *fpos = numbytes - 125;
- memcpy(mp3.id3.title, map + *fpos, 30);
- *fpos += 30;
+ fpos = numbytes - 125;
+ memcpy(mp3.id3.title, map + fpos, 30);
+ fpos += 30;
mp3.id3.title[30] = '\0';
- memcpy(mp3.id3.artist, map + *fpos, 30);
- *fpos += 30;
+ memcpy(mp3.id3.artist, map + fpos, 30);
+ fpos += 30;
mp3.id3.artist[30] = '\0';
- memcpy(mp3.id3.album, map + *fpos, 30);
- *fpos += 30;
+ memcpy(mp3.id3.album, map + fpos, 30);
+ fpos += 30;
mp3.id3.album[30] = '\0';
- memcpy(mp3.id3.year, map + *fpos, 4);
- *fpos += 4;
+ memcpy(mp3.id3.year, map + fpos, 4);
+ fpos += 4;
mp3.id3.year[4] = '\0';
- memcpy(mp3.id3.comment, map + *fpos, 30);
+ memcpy(mp3.id3.comment, map + fpos, 30);
mp3.id3.comment[30] = '\0';
mp3.id3_isvalid = 1;
unpad(mp3.id3.title);
unpad(mp3.id3.comment);
}
-static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos)
+static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos,
+ struct mp3header *header)
{
int frame_len;
- frame_len = get_header(map, numbytes, fpos, &mp3.header);
+ frame_len = get_header(map, numbytes, fpos, header);
if (frame_len < 0)
return frame_len;
if (!frame_len) {
- frame_len = mp3_seek_next_header(map, numbytes, fpos);
+ frame_len = mp3_seek_next_header(map, numbytes, fpos, header);
if (frame_len <= 0)
return frame_len;
} else
struct timeval total_time = {0, 0};
unsigned chunk_table_size = 1000; /* gets increased on demand */
off_t fpos = 0;
+ struct mp3header header;
afhi->chunks_total = 0;
afhi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t));
- mp3_get_id3(map, numbytes, &fpos);
- fpos = 0;
+ mp3_get_id3(map, numbytes);
mp3.vbr = 0;
while (1) {
unsigned long freq, br, fl;
struct timeval tmp, cct; /* current chunk time */
fpos += len;
- len = find_valid_start(map, numbytes, &fpos);
+ len = find_valid_start(map, numbytes, &fpos, &header);
if (len <= 0)
break;
- ret = header_frequency(&mp3.header);
+ ret = header_frequency(&header);
if (ret < 0)
continue;
freq = ret;
- ret = header_bitrate(&mp3.header);
+ ret = header_bitrate(&header);
if (ret < 0)
continue;
br = ret;
- ret = frame_length(&mp3.header);
+ ret = frame_length(&header);
if (ret < 0)
continue;
fl = ret;
afhi->chunk_table[afhi->chunks_total] = numbytes - 1;
afhi->bitrate = br_avg;
afhi->frequency = freq_avg;
- afhi->channels = header_channels(&mp3.header);
+ afhi->channels = header_channels(&header);
afhi->seconds_total = (tv2ms(&total_time) + 500) / 1000;
tv_divide(afhi->chunks_total, &total_time, &afhi->chunk_tv);
PARA_DEBUG_LOG("%lu chunks, each %lums\n", afhi->chunks_total,
tv2ms(&afhi->chunk_tv));
tv_scale(3, &afhi->chunk_tv, &afhi->eof_tv);
PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afhi->eof_tv));
+ write_info_str(afhi, &header);
return 1;
err_out:
- PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
free(afhi->chunk_table);
return ret;
}
ret = mp3_read_info((unsigned char *)map, numbytes, afhi);
if (ret < 0)
return ret;
- write_info_str(afhi);
if (afhi->seconds_total < 2 || !afhi->chunks_total)
return -E_MP3_INFO;
return 1;
projects / paraslash.git / blobdiff