introduce struct writer and struct writer_node

[paraslash.git] / compress.c

diff --git a/compress.c b/compress.c
index b7ddc28534106eede2ba8b7e6ad1b1d60a3b5510..b4e4c40a7a1663c95b38cdbada69715c519da5dc 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -36,7 +36,7 @@ struct private_compress_data {
        /** the current multiplier */
        unsigned current_gain;
        /** points to the configuration data for this instance of the compress filter */
-       struct gengetopt_args_info *conf;
+       struct compress_filter_args_info *conf;
        /** minimal admissible gain */
        unsigned min_gain;
        /** maximal admissible gain */
@@ -49,7 +49,8 @@ struct private_compress_data {
 
 static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 {
-       size_t i, length = MIN((inbuf_len / 2) * 2, (fn->bufsize - fn->loaded) / 2 * 2);
+       size_t i, length = PARA_MIN((inbuf_len / 2) * 2,
+               (fn->bufsize - fn->loaded) / 2 * 2);
        struct private_compress_data *pcd = fn->private_data;
        int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded);
        unsigned gain_shift = pcd->conf->inertia_arg + pcd->conf->damp_arg,
@@ -111,7 +112,7 @@ static void close_compress(struct filter_node *fn)
 
 static void *compress_parse_config(int argc, char **argv)
 {
-       struct gengetopt_args_info *ret = para_calloc(sizeof(struct gengetopt_args_info));
+       struct compress_filter_args_info *ret = para_calloc(sizeof(struct compress_filter_args_info));
        if (!compress_cmdline_parser(argc, argv, ret))
                return ret;
        free(ret);