Kill struct mp3info->header.

[paraslash.git] / mp3_afh.c

diff --git a/mp3_afh.c b/mp3_afh.c
index 5a8c956d219bf1b11e6a757f7555a6ba1c605b5b..18f5dc48e0d407cd30b71c50e4b75fa5385fa338 100644 (file)
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -56,7 +56,6 @@ struct id3tag {
 };
 
 struct mp3info {
-       struct mp3header header;
        int id3_isvalid;
        struct id3tag id3;
        int vbr;
@@ -134,16 +133,16 @@ static int frame_length(struct mp3header *header)
                + 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),
+                       header_mode(header),
                status_item_list[SI_TAGINFO1], v && *mp3.id3.title?
                        mp3.id3.title : "(title tag not set)",
                        v && *mp3.id3.artist?
@@ -231,7 +230,8 @@ out:
  * 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;
@@ -254,7 +254,7 @@ static int mp3_seek_next_header(unsigned char *map, size_t numbytes, off_t *fpos
                }
                if (k == MIN_CONSEC_GOOD_FRAMES) {
                        *fpos = valid_start;
-                       memcpy(&(mp3.header), &h2, sizeof(struct mp3header));
+                       *result = h2;
                        return first_len;
                }
        }
@@ -301,15 +301,16 @@ static void mp3_get_id3(unsigned char *map, size_t numbytes)
        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
@@ -327,6 +328,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
        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));
@@ -336,18 +338,18 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
                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;
@@ -387,13 +389,14 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
        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));
@@ -412,7 +415,6 @@ int mp3_get_file_info(char *map, size_t numbytes,
        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;