From cc1da16c0ee0dcc89fdc58ae4dd3a2af1bb4cd68 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Fri, 23 Apr 2010 21:36:37 +0200 Subject: fixed id3v1 read/write --- junklib.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'junklib.c') diff --git a/junklib.c b/junklib.c index d68c7763..fa50ca71 100644 --- a/junklib.c +++ b/junklib.c @@ -543,16 +543,16 @@ junk_id3v1_read (playItem_t *it, DB_FILE *fp) { // add meta // trace ("%s - %s - %s - %s - %s - %s\n", title, artist, album, year, comment, genre); - pl_add_meta (it, "title", convstr_id3v1 (title, strlen (title))); - pl_add_meta (it, "artist", convstr_id3v1 (artist, strlen (artist))); - pl_add_meta (it, "album", convstr_id3v1 (album, strlen (album))); - pl_add_meta (it, "year", year); - pl_add_meta (it, "comment", convstr_id3v1 (comment, strlen (comment))); - pl_add_meta (it, "genre", convstr_id3v1 (genre, strlen (genre))); + pl_append_meta (it, "title", convstr_id3v1 (title, strlen (title))); + pl_append_meta (it, "artist", convstr_id3v1 (artist, strlen (artist))); + pl_append_meta (it, "album", convstr_id3v1 (album, strlen (album))); + pl_append_meta (it, "year", year); + pl_append_meta (it, "comment", convstr_id3v1 (comment, strlen (comment))); + pl_append_meta (it, "genre", convstr_id3v1 (genre, strlen (genre))); if (tracknum != 0xff) { char s[4]; snprintf (s, 4, "%d", tracknum); - pl_add_meta (it, "track", s); + pl_append_meta (it, "track", s); } uint32_t f = pl_get_item_flags (it); @@ -586,6 +586,10 @@ junk_id3v1_write (FILE *fp, playItem_t *it) { else {\ strncpy (store, temp, sizeof (store));\ }\ + char *cr = strchr (store, '\n');\ + if (cr) {\ + *cr = 0;\ + }\ }\ } -- cgit v1.2.3