X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wma_afh.c;h=63e49677b0f1b85c13c17160a7b249531c1fbcd4;hp=01674f1a1dc1edfa500046f031b436cd83348635;hb=HEAD;hpb=ee7c57f8dc4edfdc91f2f8657b6429d90ab13e79

diff --git a/wma_afh.c b/wma_afh.c
index 01674f1a..8bff7cfc 100644
--- a/wma_afh.c
+++ b/wma_afh.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2009 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file wma_afh.c The audio format handler for WMA files. */
 
@@ -199,7 +195,7 @@ static int wma_make_chunk_table(char *buf, size_t buf_size, uint32_t packet_size
 	size_t ct_size = 250;
 	int ret, count = 0, num_frames, num_superframes;
 
-	afhi->chunk_table = para_malloc(ct_size * sizeof(uint32_t));
+	afhi->chunk_table = arr_alloc(ct_size, sizeof(uint32_t));
 	afhi->chunk_table[0] = 0;
 	afhi->chunk_table[1] = afhi->header_len;
 
@@ -322,7 +318,7 @@ static int convert_utf8_to_utf16(char *src, char **dst)
 	int ret;
 
 	if (!src || !*src) {
-		*dst = para_calloc(2);
+		*dst = zalloc(2);
 		return 0;
 	}
 	/*
@@ -338,7 +334,7 @@ static int convert_utf8_to_utf16(char *src, char **dst)
 	/* even though src is in UTF-8, strlen() should DTRT */
 	inbytes = inbytesleft = strlen(src);
 	outbytes = outbytesleft = 4 * inbytes + 2; /* hope that's enough */
-	*dst = outbuf = para_malloc(outbytes);
+	*dst = outbuf = alloc(outbytes);
 	sz = iconv(cd, ICONV_CAST &inbuf, &inbytesleft, &outbuf, &outbytesleft);
 	if (sz == (size_t)-1) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
@@ -415,7 +411,7 @@ static int make_cdo(struct taginfo *tags, const struct asf_object *cdo,
 	result->size = 16 + 8 + 5 * 2 + title_bytes + artist_bytes
 		+ orig_cr_bytes + comment_bytes + orig_rating_bytes;
 	PARA_DEBUG_LOG("cdo is %zu bytes\n", (size_t)result->size);
-	p = result->ptr = para_malloc(result->size);
+	p = result->ptr = alloc(result->size);
 	memcpy(p, content_description_header, 16);
 	p += 16;
 	write_u64(p, result->size);
@@ -473,7 +469,7 @@ static int make_ecdo(struct taginfo *tags, struct asf_object *result)
 	result->size += 2 + sizeof(album_tag_header) + 2 + 2 + 2 + album_bytes;
 	result->size += 2 + sizeof(year_tag_header) + 2 + 2 + 2 + year_bytes;
 
-	p = result->ptr = para_malloc(result->size);
+	p = result->ptr = alloc(result->size);
 	memcpy(p, extended_content_header, 16);
 	p += 16;
 	write_u64(p, result->size);
@@ -626,7 +622,7 @@ static int wma_rewrite_tags(const char *map, size_t mapsize,
 	if (top.reserved2 != 2)
 		return -E_NO_WMA;
 	p++; /* objects start at p */
-	top.objects = para_malloc(top.num_objects * sizeof(struct asf_object));
+	top.objects = arr_alloc(top.num_objects, sizeof(struct asf_object));
 	ret = read_asf_objects(p, top.size - (p - map), top.num_objects,
 		top.objects, &ton);
 	if (ret < 0)
@@ -650,13 +646,13 @@ out:
 static const char * const wma_suffixes[] = {"wma", NULL};
 
 /**
- * The init function of the wma audio format handler.
+ * The audio format handler for Windows Media Audio.
  *
- * \param afh Pointer to the struct to initialize.
+ * Only WMA version 2 is supported. This audio format handler does not depend
+ * on any third party libraries and is therefore always compiled in.
  */
-void wma_afh_init(struct audio_format_handler *afh)
-{
-	afh->get_file_info = wma_get_file_info;
-	afh->suffixes = wma_suffixes;
-	afh->rewrite_tags = wma_rewrite_tags;
-}
+const struct audio_format_handler wma_afh = {
+	.get_file_info = wma_get_file_info,
+	.suffixes = wma_suffixes,
+	.rewrite_tags = wma_rewrite_tags,
+};