dbtool -> audio file selector renaming

[paraslash.git] / filter_chain.c

diff --git a/filter_chain.c b/filter_chain.c
index d22ef28eed3cbaa1e38f1b15f2f0b73a1ce7b011..42db37830718f3618bcb0d34c25cdb04bca60e05 100644 (file)
--- a/filter_chain.c
+++ b/filter_chain.c
@@ -18,7 +18,6 @@
 
 /** \file filter_chain.c common helper functions for filter input/output */
 
-#include "gcc-compat.h"
 #include "para.h"
 #include "list.h"
 #include "filter.h"
@@ -124,7 +123,7 @@ again:
                int ret;
                if (*loaded && fn->loaded < fn->bufsize) {
                        size_t old_fn_loaded = fn->loaded;
-                       PARA_DEBUG_LOG("fc %p loaded: %d, calling %s convert\n", fci, *loaded, fn->filter->name);
+                       PARA_DEBUG_LOG("fc %p loaded: %zd, calling %s convert\n", fci, *loaded, fn->filter->name);
                        ret = fn->filter->convert(ib, *loaded, fn);
                        if (ret < 0) {
                                if (!fci->error)
@@ -135,7 +134,7 @@ again:
                        *loaded -= ret;
                        conv += ret;
                        if (*loaded && ret) {
-                               PARA_DEBUG_LOG("moving %d bytes in input buffer for %s filter\n",
+                               PARA_DEBUG_LOG("moving %zd bytes in input buffer for %s filter\n",
                                        *loaded,  fn->filter->name);
                                memmove(ib, ib + ret, *loaded);
                        }
@@ -196,7 +195,7 @@ static int parse_filter_args(int filter_num, char *options, void **conf)
                return options? -E_BAD_FILTER_OPTIONS : filter_num;
        if (options) {
 //             PARA_DEBUG_LOG("options: %s\n", options);
-               argc = split_args(options, &argv, ':');
+               argc = split_args(options, &argv, ' ');
 //             PARA_DEBUG_LOG("argc = %d, argv[0]: %s\n", argc, argv[0]);
                for (i = argc; i >= 0; i--)
                        argv[i + 1] = argv[i];
@@ -212,7 +211,7 @@ static int parse_filter_args(int filter_num, char *options, void **conf)
 /**
  * check the filter command line options
  *
- * \param fa the command line options (values separated by colons)
+ * \param fa the command line options
  * \param conf points to the filter configuration upon successful return
  *
  * Check if \a fa starts with a the name of a supported filter, followed by
@@ -242,7 +241,7 @@ int check_filter_arg(char *fa, void **conf)
                if (strncmp(name, fa, len))
                        continue;
                c = fa[len];
-               if (c && c != ':')
+               if (c && c != ' ')
                        continue;
                if (c && !filters[j].parse_config)
                        return -E_BAD_FILTER_OPTIONS;