para_server: Print a log message containing the path of the next audio file.

[paraslash.git] / wmadec_filter.c

diff --git a/wmadec_filter.c b/wmadec_filter.c
index 0ec5878c3a836d389ebac7a7188bcdb809ddcc25..96fb50082d2bff52ba082904341851048c66c6ef 100644 (file)
--- a/wmadec_filter.c
+++ b/wmadec_filter.c
@@ -1199,8 +1199,6 @@ static void wmadec_close(struct filter_node *fn)
        if (!pwd)
                return;
        wmadec_cleanup(pwd);
-       free(fn->buf);
-       fn->buf = NULL;
        free(fn->private_data);
        fn->private_data = NULL;
 }
@@ -1212,13 +1210,13 @@ static int wmadec_execute(struct btr_node *btrn, const char *cmd, char **result)
 
        if (!strcmp(cmd, "samplerate")) {
                if (pwd->ahi.sample_rate == 0)
-                       return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+                       return -E_BTR_NAVAIL;
                *result = make_message("%u", pwd->ahi.sample_rate);
                return 1;
        }
        if (!strcmp(cmd, "channels")) {
                if (pwd->ahi.channels == 0)
-                       return -ERRNO_TO_PARA_ERROR(ENAVAIL);
+                       return -E_BTR_NAVAIL;
                *result = make_message("%u", pwd->ahi.channels);
                return 1;
        }
@@ -1257,11 +1255,12 @@ next_buffer:
                        fn->min_iqs += 4096;
                        goto next_buffer;
                }
-               fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
+               fn->min_iqs = 2 * (WMA_FRAME_SKIP + pwd->ahi.block_align);
                fn->private_data = pwd;
                converted = pwd->ahi.header_len;
                goto success;
        }
+       fn->min_iqs = WMA_FRAME_SKIP + pwd->ahi.block_align;
        for (;;) {
                char *out;
                int out_size = WMA_OUTPUT_BUFFER_SIZE;
@@ -1289,10 +1288,7 @@ err:
 
 static void wmadec_open(struct filter_node *fn)
 {
-       fn->bufsize = 1024 * 1024;
-       fn->buf = para_malloc(fn->bufsize);
        fn->private_data = NULL;
-       fn->loaded = 0;
        fn->min_iqs = 4096;
 }