Make mp3_seek_next_header() more readable.

[paraslash.git] / mp3_afh.c

diff --git a/mp3_afh.c b/mp3_afh.c
index 710b6a50aa149f5f2192c591a1e0a50c649543dd..8b8a83d82eefb160bc7ceee6ee3f11ede22b78a3 100644 (file)
--- a/mp3_afh.c
+++ b/mp3_afh.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  */
@@ -138,17 +138,17 @@ static void write_info_str(struct afh_info *afhi)
 {
        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?
+               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 : "????",
@@ -163,7 +163,7 @@ static void write_info_str(struct afh_info *afhi)
 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;
 }
@@ -231,7 +231,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,15 +255,17 @@ 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;
                }
        }
        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';
@@ -271,25 +274,25 @@ static void mp3_get_id3(unsigned char *map, size_t numbytes, off_t *fpos)
        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);
@@ -307,7 +310,7 @@ static int find_valid_start(unsigned char *map, size_t numbytes, off_t *fpos)
        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, &mp3.header);
                if (frame_len <= 0)
                        return frame_len;
        } else
@@ -328,8 +331,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
 
        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;
@@ -395,7 +397,7 @@ static int mp3_read_info(unsigned char *map, size_t numbytes,
        PARA_DEBUG_LOG("eof timeout: %lu\n", tv2ms(&afhi->eof_tv));
        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;
 }