X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp.c;h=fb5a0c07472c46bb7d5ca42fcb4061d54755f96b;hb=be5daec66f163725489f42d512659a8af5c3fd59;hp=aea767d99fea4b7bf0954504a03602766831a3b9;hpb=30e977fe4a01c7c080527f447e3968e524212239;p=paraslash.git

diff --git a/mp.c b/mp.c
index aea767d9..fb5a0c07 100644
--- a/mp.c
+++ b/mp.c
@@ -90,7 +90,7 @@ unsigned parse_quoted_string(const char *src, const char quote_chars[2],
 
 	assert(len >= 2);
 	assert(src[0] == quote_chars[0]);
-	p = dst = para_malloc(len - 1);
+	p = dst = alloc(len - 1);
 	backslash = false;
 	for (n = 1;; n++) {
 		char c;
@@ -389,6 +389,27 @@ MP_AFHI(frequency)
 MP_AFHI(channels)
 /** \endcond */
 
+/**
+ * Return the duration of the audio file from the afh info structure.
+ *
+ * \param ctx See \ref mp_path().
+ *
+ * The duration is computed by multiplying the number of chunks and the
+ * duration of one chunk.
+ *
+ * \return The approximate number of milliseconds.
+ */
+int64_t mp_duration(struct mp_context *ctx)
+{
+	struct timeval tmp;
+	int ret = get_afhi(ctx);
+
+	if (ret < 0)
+		return 0;
+	tv_scale(ctx->afhi.chunks_total, &ctx->afhi.chunk_tv, &tmp);
+	return tv2ms(&tmp);
+}
+
 /**
  * Define a function which extracts and returns the value of a meta tag.
  *
@@ -497,7 +518,7 @@ int mp_init(const char *definition, int nbytes, struct mp_context **result,
 			*errmsg = NULL;
 		return 0;
 	}
-	ctx = para_calloc(sizeof(*ctx));
+	ctx = zalloc(sizeof(*ctx));
 	ctx->errmsg = NULL;
 	ctx->ast = NULL;