audiod: Simplify two log messages.
[paraslash.git] / filter_chain.c
index 70c3d39..b398744 100644 (file)
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file filter_chain.c common helper functions for filter input/output */
@@ -100,6 +88,9 @@ static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
 /**
  * call the convert function of each filter
  *
+ * \param s unused
+ * \param t the task containing the filter chain
+ *
  * This is the core function of the filter subsystem. It loops over the list of
  * filter nodes determined by \a t and calls the filter's convert function if
  * there is input available for the filter node in question. If the convert
@@ -130,21 +121,22 @@ again:
        conv = 0;
        list_for_each_entry(fn, &fc->filters, node) {
                if (*loaded && fn->loaded < fn->bufsize) {
-                       size_t old_fn_loaded = fn->loaded;
+                       size_t size, old_fn_loaded = fn->loaded;
 //                     PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n",
 //                             fc, *loaded, fn->filter->name);
                        t->ret = fn->filter->convert(ib, *loaded, fn);
                        if (t->ret < 0)
                                goto err_out;
-                       call_callbacks(fn, ib, t->ret, fn->buf + old_fn_loaded,
+                       size = t->ret;
+                       call_callbacks(fn, ib, size, fn->buf + old_fn_loaded,
                                fn->loaded - old_fn_loaded);
-                       *loaded -= t->ret;
-                       conv += t->ret;
-                       if (*loaded && t->ret) {
+                       *loaded -= size;
+                       conv += size;
+                       if (*loaded && size) {
 //                             PARA_DEBUG_LOG("moving %zd bytes in input "
 //                                     "buffer for %s filter\n",
 //                                     *loaded,  fn->filter->name);
-                               memmove(ib, ib + t->ret, *loaded);
+                               memmove(ib, ib + size, *loaded);
                        }
                }
                ib = fn->buf;
@@ -219,6 +211,8 @@ static int parse_filter_args(int filter_num, char *options, void **conf)
        argv[0] = para_strdup(f->name);
        argc += 1;
        *conf = f->parse_config(argc, argv);
+       free(argv[0]);
+       free(argv);
        return *conf? filter_num : -E_BAD_FILTER_OPTIONS;
 }