From 98e61f7563ae284e058ce6251b89626ab6254ff7 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Sun, 29 Jun 2008 14:35:59 +0200 Subject: [PATCH] Get rid of struct id3tag and struct mp3info. As a preparation for dealing with id3v2 tags. --- mp3_afh.c | 114 ++++++++++++++++++++---------------------------------- 1 file changed, 41 insertions(+), 73 deletions(-) diff --git a/mp3_afh.c b/mp3_afh.c index a9d36fa1..7dda5496 100644 --- a/mp3_afh.c +++ b/mp3_afh.c @@ -47,20 +47,6 @@ struct mp3header { unsigned int emphasis; }; -struct id3tag { - char title[31]; - char artist[31]; - char album[31]; - char year[5]; - char comment[31]; -}; - -struct mp3info { - int id3_isvalid; - struct id3tag id3; - int vbr; -}; - /** \endcond */ static const int frequencies[3][4] = { {22050,24000,16000,50000}, /* MPEG 2.0 */ @@ -85,8 +71,6 @@ static const int mp3info_bitrate[2][3][14] = { static const int frame_size_index[] = {24000, 72000, 72000}; static const char *mode_text[] = {"stereo", "joint stereo", "dual channel", "mono", "invalid"}; -static struct mp3info mp3; - static int header_frequency(struct mp3header *h) { if (h->version > 2 || h->freq > 3) @@ -133,29 +117,6 @@ static int frame_length(struct mp3header *header) + header->padding; } -static void write_info_str(struct afh_info *afhi, struct mp3header *header) -{ - int v = mp3.id3_isvalid; - - 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(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_TAGINFO2], - v && *mp3.id3.album? - mp3.id3.album : "(album tag not set)", - v && *mp3.id3.year? mp3.id3.year : "????", - v && *mp3.id3.comment? - mp3.id3.comment : "(comment tag not set)" - ); -} - /* * Remove trailing whitespace from the end of a string */ @@ -261,44 +222,47 @@ static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos return 0; } -static void mp3_get_id3(unsigned char *map, size_t numbytes) +static char *mp3_get_id3(unsigned char *map, size_t numbytes) { + char title[31], artist[31], album[31], year[5], comment[31]; off_t fpos; - mp3.id3_isvalid = 0; - mp3.id3.title[0] = '\0'; - mp3.id3.artist[0] = '\0'; - mp3.id3.album[0] = '\0'; - mp3.id3.comment[0] = '\0'; - mp3.id3.year[0] = '\0'; - if (numbytes < 128) - return; - fpos = numbytes - 128; - if (strncmp("TAG", (char *) map + fpos, 3)) { - PARA_DEBUG_LOG("no id3 tag\n"); - return; + if (numbytes < 128 || strncmp("TAG", (char *)map + numbytes - 128, 3)) { + PARA_DEBUG_LOG("no id3 v1 tag\n"); + return make_message("%s: (no id3 v1 tag)\n%s:\n", + status_item_list[SI_TAGINFO1], + status_item_list[SI_TAGINFO2]); } fpos = numbytes - 125; - memcpy(mp3.id3.title, map + fpos, 30); + memcpy(title, map + fpos, 30); fpos += 30; - mp3.id3.title[30] = '\0'; - memcpy(mp3.id3.artist, map + fpos, 30); + title[30] = '\0'; + memcpy(artist, map + fpos, 30); fpos += 30; - mp3.id3.artist[30] = '\0'; - memcpy(mp3.id3.album, map + fpos, 30); + artist[30] = '\0'; + memcpy(album, map + fpos, 30); fpos += 30; - mp3.id3.album[30] = '\0'; - memcpy(mp3.id3.year, map + fpos, 4); + album[30] = '\0'; + memcpy(year, map + fpos, 4); fpos += 4; - mp3.id3.year[4] = '\0'; - memcpy(mp3.id3.comment, map + fpos, 30); - mp3.id3.comment[30] = '\0'; - mp3.id3_isvalid = 1; - unpad(mp3.id3.title); - unpad(mp3.id3.artist); - unpad(mp3.id3.album); - unpad(mp3.id3.year); - unpad(mp3.id3.comment); + year[4] = '\0'; + memcpy(comment, map + fpos, 30); + comment[30] = '\0'; + unpad(title); + unpad(artist); + unpad(album); + unpad(year); + unpad(comment); + return make_message("%s: %s, by %s\n" /* taginfo1 */ + "%s: A: %s, Y: %s, C: %s\n", /* taginfo 2*/ + status_item_list[SI_TAGINFO1], + *title? title : "(title tag not set)", + *artist? artist : "(artist tag not set)", + status_item_list[SI_TAGINFO2], + *album? album : "(album tag not set)", + *year? year : "????", + *comment? comment : "(comment tag not set)" + ); } static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos, @@ -324,16 +288,16 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, struct afh_info *afhi) { long freq_avg = 0, br_avg = 0; - int ret, len = 0, old_br = -1; + int ret, len = 0, old_br = -1, vbr = 0; struct timeval total_time = {0, 0}; unsigned chunk_table_size = 1000; /* gets increased on demand */ off_t fpos = 0; struct mp3header header; + char *taginfo; afhi->chunks_total = 0; afhi->chunk_table = para_malloc(chunk_table_size * sizeof(size_t)); - mp3_get_id3(map, numbytes); - mp3.vbr = 0; + taginfo = mp3_get_id3(map, numbytes); while (1) { unsigned long freq, br, fl; struct timeval tmp, cct; /* current chunk time */ @@ -378,7 +342,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, freq_avg += ((long)freq - freq_avg) / ((long)afhi->chunks_total + 1); br_avg += ((long)br - br_avg) / ((long)afhi->chunks_total + 1); if (old_br != br) - mp3.vbr = 1; + vbr = 1; old_br = br; } ret = -E_MP3_INFO; @@ -394,9 +358,13 @@ static int mp3_read_info(unsigned char *map, size_t numbytes, 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); + afhi->info_string = make_message("%s: %cbr, %s\n%s", + status_item_list[SI_AUDIO_FILE_INFO], vbr? 'v' : 'c', + header_mode(&header), taginfo); + free(taginfo); return 1; err_out: + free(taginfo); PARA_ERROR_LOG("%s\n", para_strerror(-ret)); free(afhi->chunk_table); return ret; -- 2.39.5