audiod: Fix status item parsing for long status items.

[paraslash.git] / aacdec_filter.c

diff --git a/aacdec_filter.c b/aacdec_filter.c
index 5166555272c672ecda4bd4109d2e29b06b90aa4d..209c9a4674adfba61f82f8d6e8fac05ec37ccff3 100644 (file)
--- a/aacdec_filter.c
+++ b/aacdec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -23,10 +23,7 @@
 #include "string.h"
 #include "aac.h"
 
-/** the output buffer size */
-#define AAC_OUTBUF_SIZE (32 * 1024)
-
-/** give up decoding after that many errors */
+/** Give up decoding after that many errors. */
 #define MAX_ERRORS 20
 
 /**
@@ -65,13 +62,13 @@ static int aacdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 
        if (!strcmp(cmd, "samplerate")) {
                if (padd->samplerate == 0)
-                       return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+                       return -E_BTR_NAVAIL;
                *result = make_message("%u", padd->samplerate);
                return 1;
        }
        if (!strcmp(cmd, "channels")) {
                if (padd->channels == 0)
-                       return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+                       return -E_BTR_NAVAIL;
                *result = make_message("%u", padd->channels);
                return 1;
        }
@@ -83,8 +80,6 @@ static void aacdec_open(struct filter_node *fn)
        struct private_aacdec_data *padd = para_calloc(sizeof(*padd));
 
        fn->private_data = padd;
-       fn->bufsize = AAC_OUTBUF_SIZE;
-       fn->buf = para_calloc(fn->bufsize);
        fn->min_iqs = 2048;
        padd->handle = aac_open();
 }
@@ -94,8 +89,6 @@ static void aacdec_close(struct filter_node *fn)
        struct private_aacdec_data *padd = fn->private_data;
 
        NeAACDecClose(padd->handle);
-       free(fn->buf);
-       fn->buf = NULL;
        free(padd);
        fn->private_data = NULL;
 }