From: Colin Guthrie <colin@mageia.org>
Date: Thu, 14 Apr 2011 11:00:58 +0000 (+0200)
Subject: equalizer: Use sink_master as the module argument rather than just master.
X-Git-Tag: v0.99.1~161
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34658927a3821cfc411703962af08fd3c334c277;p=platform%2Fupstream%2Fpulseaudio.git

equalizer: Use sink_master as the module argument rather than just 

This brings more uniformity to arguments to match module-echo-cancel
(which needs both sink and source masters, hence the disambiguation).

This will allow other modules to load filters in a more uniform way
in the future without kludges to deal with variation in arguments.
---

diff --git a/src/modules/module-equalizer-sink.c b/src/modules/module-equalizer-sink.c
index bb350c3..0bbb23a 100644
--- a/src/modules/module-equalizer-sink.c
+++ b/src/modules/module-equalizer-sink.c
@@ -79,7 +79,7 @@ PA_MODULE_LOAD_ONCE(FALSE);
 PA_MODULE_USAGE(
         _("sink_name=<name of the sink> "
           "sink_properties=<properties for the sink> "
-          "master=<sink to connect to> "
+          "sink_master=<sink to connect to> "
           "format=<sample format> "
           "rate=<sample rate> "
           "channels=<number of channels> "
@@ -133,7 +133,7 @@ struct userdata {
 static const char* const valid_modargs[] = {
     "sink_name",
     "sink_properties",
-    "master",
+    "sink_master",
     "format",
     "rate",
     "channels",
@@ -1088,7 +1088,7 @@ int pa__init(pa_module*m) {
         goto fail;
     }
 
-    if (!(master = pa_namereg_get(m->core, pa_modargs_get_value(ma, "master", NULL), PA_NAMEREG_SINK))) {
+    if (!(master = pa_namereg_get(m->core, pa_modargs_get_value(ma, "sink_master", NULL), PA_NAMEREG_SINK))) {
         pa_log("Master sink not found");
         goto fail;
     }