X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aac_afh.c;h=3458af959c110a9c21cb81d68287c4a09f3526eb;hp=d12dfa19ca8eb59f7a47951665941d63fd8ba1a6;hb=66cfa4ab3cd509b1b7d1b5fb860fc4644a2313ab;hpb=43e0a7f669d782e73513119b7140dc4e56bcc3d7

diff --git a/aac_afh.c b/aac_afh.c
index d12dfa19..3458af95 100644
--- a/aac_afh.c
+++ b/aac_afh.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,7 @@
  * Ahead Software AG
  */
 
-/** \file aac_afh.c para_server's aac audio format handler */
+/** \file aac_afh.c para_server's aac audio format handler. */
 
 #include <regex.h>
 
@@ -42,9 +42,9 @@ static int aac_find_stsz(unsigned char *buf, size_t buflen, off_t *skip)
 	return -E_STSZ;
 }
 
-static int atom_cmp(unsigned char *buf1, char *buf2)
+static int atom_cmp(const unsigned char *buf1, const char *buf2)
 {
-	unsigned char *b2 = (unsigned char *)buf2;
+	const unsigned char *b2 = (unsigned char *)buf2;
 
 	if (buf1[0] != b2[0])
 		return 1;
@@ -111,15 +111,15 @@ static void read_tags(unsigned char *buf, size_t buflen, struct afh_info *afhi)
 		q = p + ret + ret2 + 8;
 		if (q + size2 > buf + buflen)
 			break;
-		if (!atom_cmp(type1, "©ART"))
+		if (!atom_cmp(type1, "\xa9" "ART"))
 			afhi->tags.artist = get_tag(q, size2);
-		else if (!atom_cmp(type1, "©alb"))
+		else if (!atom_cmp(type1, "\xa9" "alb"))
 			afhi->tags.album = get_tag(q, size2);
-		else if (!atom_cmp(type1, "©nam"))
+		else if (!atom_cmp(type1, "\xa9" "nam"))
 			afhi->tags.title = get_tag(q, size2);
-		else if (!atom_cmp(type1, "©cmt"))
+		else if (!atom_cmp(type1, "\xa9" "cmt"))
 			afhi->tags.comment = get_tag(q, size2);
-		else if (!atom_cmp(type1, "©day"))
+		else if (!atom_cmp(type1, "\xa9" "day"))
 			afhi->tags.year = get_tag(q, size2);
 		p += size1;
 	}
@@ -191,8 +191,7 @@ static int aac_set_chunk_tv(struct afh_info *afhi,
 {
 	float tmp = mp4ASC->sbr_present_flag == 1? 2047 : 1023;
 	struct timeval total;
-	long unsigned ms = 1000.0 * afhi->chunks_total * tmp
-		/ mp4ASC->samplingFrequency;
+	long unsigned ms;
 
 	if (!mp4ASC->samplingFrequency)
 		return -E_MP4ASC;