X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wma_afh.c;h=65795fd8b8e4ac66cc1e3cf1cba8e18d68800636;hp=9b7d85b3fd7d059c34476419841af8e9d3da42a1;hb=465f84546f810776ea6c4bd06fec34ff8452e933;hpb=9417eae5ca2b9f10d25f769221e8fd91048bc68a

diff --git a/wma_afh.c b/wma_afh.c
index 9b7d85b3..65795fd8 100644
--- a/wma_afh.c
+++ b/wma_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -132,7 +132,7 @@ static const char album_tag_header[] = { /* WM/AlbumTitle */
 static void read_asf_tags(const char *buf, int buf_size, struct taginfo *ti)
 {
 	const char *p, *end = buf + buf_size, *q;
-	uint16_t len1, len2, len3, len4, len5;
+	uint16_t len1, len2, len3, len4;
 
 	p = search_pattern(comment_header, sizeof(comment_header),
 		buf, buf_size);
@@ -149,7 +149,7 @@ static void read_asf_tags(const char *buf, int buf_size, struct taginfo *ti)
 	p += 2;
 	len4 = read_u16(p);
 	p += 2;
-	len5 = read_u16(p);
+	/* ignore length of the rating information */
 	p += 2;
 	if (p + len1 >= end)
 		goto next;
@@ -158,10 +158,10 @@ static void read_asf_tags(const char *buf, int buf_size, struct taginfo *ti)
 	if (p + len2 >= end)
 		goto next;
 	ti->artist = get_str16(p, len2);
-	p += len2 + len3 + len4;
-	if (p + len5 >= end)
+	p += len2 + len3;
+	if (p + len4 >= end)
 		goto next;
-	ti->comment = get_str16(p, len5);
+	ti->comment = get_str16(p, len4);
 next:
 	p = search_pattern(extended_content_header, sizeof(extended_content_header),
 		buf, buf_size);
@@ -257,7 +257,15 @@ static int wma_get_file_info(char *map, size_t numbytes, __a_unused int fd,
 	afhi->frequency = ahi.sample_rate;
 	afhi->channels = ahi.channels;
 	afhi->header_len = ahi.header_len;
-	afhi->header_offset = 0;
+
+	afhi->techinfo = make_message("%s%s%s%s%s",
+		ahi.use_exp_vlc? "exp vlc" : "",
+		(ahi.use_bit_reservoir && ahi.use_exp_vlc)? ", " : "",
+		ahi.use_bit_reservoir? "bit reservoir" : "",
+		(ahi.use_variable_block_len &&
+			(ahi.use_exp_vlc || ahi.use_bit_reservoir)? ", " : ""),
+		ahi.use_variable_block_len? "vbl" : ""
+	);
 	wma_make_chunk_table(map + ahi.header_len, numbytes - ahi.header_len,
 		ahi.block_align, afhi);
 	read_asf_tags(map, ahi.header_len, &afhi->tags);