Merge commit 'meins/master'

[paraslash.git] / mp3_afh.c

diff --git a/mp3_afh.c b/mp3_afh.c
index ed55d7c02e7a7c50f1b7bc8ca4af950d2eed09b2..5a8c956d219bf1b11e6a757f7555a6ba1c605b5b 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.
  */
@@ -139,20 +139,21 @@ static void write_info_str(struct afh_info *afhi)
        int v = mp3.id3_isvalid;
 
        snprintf(afhi->info_string, MMD_INFO_SIZE,
-               "audio_file_info1:%lu x %lums, %u kbit/s (%cbr) %i KHz %s\n"
-               "audio_file_info2:%s, by %s\n"
-               "audio_file_info3:A: %s, Y: %s, C: %s\n",
-               afhi->chunks_total,
-               tv2ms(&afhi->chunk_tv),
-               afhi->bitrate,
-               mp3.vbr? 'v' : 'c',
-               afhi->frequency / 1000,
-               header_mode(&mp3.header),
-               v && *mp3.id3.title? mp3.id3.title : "(title tag not set)",
-               v && *mp3.id3.artist? mp3.id3.artist : "(artist tag not set)",
-               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)"
+               "%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_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)"
        );
 }
 
@@ -162,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;
 }
@@ -260,8 +261,10 @@ 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, 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';
@@ -270,25 +273,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);
@@ -327,8 +330,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;
@@ -394,7 +396,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;
 }