/*
- * 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.
*/
{
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*/
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);
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;
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;
}