X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aac_afh.c;h=ae1e99dc9662095af7cc887173c85b9598dd7796;hb=b540913d5c85386eede1c10930e14219fb7e1fea;hp=f3a06c4c213c80fad95158d8c33b18fafa43e33a;hpb=1879b0474c3de06f4a07af5cfff1eb6e94b5f622;p=paraslash.git

diff --git a/aac_afh.c b/aac_afh.c
index f3a06c4c..ae1e99dc 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -41,11 +41,19 @@ static ssize_t aac_afh_read_cb(void *user_data, void *dest, size_t want)
 	return rv;
 }
 
-static uint32_t aac_afh_seek_cb(void *user_data, uint64_t pos)
+static off_t aac_afh_seek_cb(void *user_data, off_t offset, int whence)
 {
 	struct aac_afh_context *c = user_data;
-	c->fpos = pos;
-	return 0;
+
+	if (whence == SEEK_SET)
+		c->fpos = offset;
+	else if (whence == SEEK_CUR)
+		c->fpos += offset;
+	else if (whence == SEEK_END)
+		c->fpos = c->mapsize + offset;
+	else
+		assert(false);
+	return c->fpos;
 }
 
 static int aac_afh_open(const void *map, size_t mapsize, void **afh_context)
@@ -99,13 +107,13 @@ static int aac_afh_get_chunk(uint32_t chunk_num, void *afh_context,
 	return 1;
 }
 
-static void _aac_afh_get_taginfo(const struct mp4 *mp4, struct taginfo *tags)
+static void aac_afh_get_taginfo(const struct mp4 *mp4, struct taginfo *tags)
 {
-	tags->artist = mp4_meta_get_artist(mp4);
-	tags->title = mp4_meta_get_title(mp4);
-	tags->year = mp4_meta_get_date(mp4);
-	tags->album = mp4_meta_get_album(mp4);
-	tags->comment = mp4_meta_get_comment(mp4);
+	tags->artist = mp4_get_tag_value(mp4, "artist");
+	tags->title = mp4_get_tag_value(mp4, "title");
+	tags->year = mp4_get_tag_value(mp4, "date");
+	tags->album = mp4_get_tag_value(mp4, "album");
+	tags->comment = mp4_get_tag_value(mp4, "comment");
 }
 
 /*
@@ -154,7 +162,7 @@ static int aac_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 	if (aac_afh_get_chunk(0, c, &buf, &len) >= 0)
 		numbytes -= buf - map;
 	afhi->bitrate = 8 * numbytes / afhi->seconds_total / 1000;
-	_aac_afh_get_taginfo(c->mp4, &afhi->tags);
+	aac_afh_get_taginfo(c->mp4, &afhi->tags);
 	ret = 1;
 close:
 	aac_afh_close(c);
@@ -167,16 +175,19 @@ static ssize_t aac_afh_meta_read_cb(void *user_data, void *dest, size_t want)
 	return read(fd, dest, want);
 }
 
-static uint32_t aac_afh_meta_seek_cb(void *user_data, uint64_t pos)
+static off_t aac_afh_meta_seek_cb(void *user_data, off_t offset, int whence)
 {
 	int fd = *(int *)user_data;
-	return lseek(fd, pos, SEEK_SET);
+	off_t ret = lseek(fd, offset, whence);
+
+	assert(ret != (off_t)-1);
+	return ret;
 }
 
-static uint32_t aac_afh_meta_write_cb(void *user_data, void *dest, uint32_t want)
+static ssize_t aac_afh_meta_write_cb(void *user_data, void *dest, size_t count)
 {
 	int fd = *(int *)user_data;
-	return write(fd, dest, want);
+	return write(fd, dest, count);
 }
 
 static uint32_t aac_afh_meta_truncate_cb(void *user_data)
@@ -238,11 +249,7 @@ static int aac_afh_rewrite_tags(const char *map, size_t mapsize,
 	replace_or_add_tag("album", tags->album, metadata);
 	replace_or_add_tag("date", tags->year, metadata);
 	replace_or_add_tag("comment", tags->comment, metadata);
-	ret = -E_MP4_META_WRITE;
-	if (!mp4_meta_update(mp4))
-		goto close;
-	ret = 1;
-close:
+	ret = mp4_meta_update(mp4);
 	mp4_close(mp4);
 	return ret;
 }