From 7eff884848a3c1d15bc37e1602a78e63fa9cc511 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Mon, 11 Feb 2013 10:56:45 +0100 Subject: [PATCH] echo-cancel-test: Pass aec_args with module args The echo canceller module can pass arguments to the EC implementation via the module parameter aec_args. However, the echo-cancel-test passes EC arguments via a separate argv[] option, which is inconsistent. Fix this. --- src/modules/echo-cancel/module-echo-cancel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c index 718e104..db6b46c 100644 --- a/src/modules/echo-cancel/module-echo-cancel.c +++ b/src/modules/echo-cancel/module-echo-cancel.c @@ -2140,7 +2140,7 @@ int main(int argc, char* argv[]) { goto fail; if (!u.ec->init(u.core, u.ec, &source_ss, &source_map, &sink_ss, &sink_map, &nframes, - (argc > 5) ? argv[5] : NULL )) { + pa_modargs_get_value(ma, "aec_args", NULL))) { pa_log("Failed to init AEC engine"); goto fail; } @@ -2148,12 +2148,12 @@ int main(int argc, char* argv[]) { u.sink_blocksize = nframes * pa_frame_size(&sink_ss); if (u.ec->params.drift_compensation) { - if (argc < 7) { + if (argc < 6) { pa_log("Drift compensation enabled but drift file not specified"); goto fail; } - u.drift_file = fopen(argv[6], "rt"); + u.drift_file = fopen(argv[5], "rt"); if (u.drift_file == NULL) { perror ("fopen failed"); @@ -2254,7 +2254,7 @@ out: return ret; usage: - pa_log("Usage: %s play_file rec_file out_file [module args] [aec_args] [drift_file]", argv[0]); + pa_log("Usage: %s play_file rec_file out_file [module args] [drift_file]", argv[0]); fail: ret = -1; -- 2.7.4