diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-05-28 02:39:22 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-05-28 02:39:22 +0200 |
commit | 1c4393acf0a641a4f462cfa6c368d23d9e55a1b8 (patch) | |
tree | d6c28d7e2c0ada5c091c404f0d6144aebafe4c04 /src/modules/module-combine.c | |
parent | 208862698e8ebf6bebfd9a07e4cc4b43b3cd0d96 (diff) |
modules: add {sink|source|card}_properties argument to all modules
Diffstat (limited to 'src/modules/module-combine.c')
-rw-r--r-- | src/modules/module-combine.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c index a1ef8da4..02a7e1ff 100644 --- a/src/modules/module-combine.c +++ b/src/modules/module-combine.c @@ -55,12 +55,13 @@ PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(FALSE); PA_MODULE_USAGE( "sink_name=<name for the sink> " + "sink_properties=<properties for the sink> " "slaves=<slave sinks> " "adjust_time=<seconds> " "resample_method=<method> " "format=<sample format> " - "channels=<number of channels> " "rate=<sample rate> " + "channels=<number of channels> " "channel_map=<channel map>"); #define DEFAULT_SINK_NAME "combined" @@ -73,12 +74,13 @@ PA_MODULE_USAGE( static const char* const valid_modargs[] = { "sink_name", + "sink_properties", "slaves", "adjust_time", "resample_method", "format", - "channels", "rate", + "channels", "channel_map", NULL }; @@ -1080,6 +1082,12 @@ int pa__init(pa_module*m) { if (slaves) pa_proplist_sets(data.proplist, "combine.slaves", slaves); + if (pa_modargs_get_proplist(ma, "sink_properties", data.proplist, PA_UPDATE_REPLACE) < 0) { + pa_log("Invalid properties"); + pa_sink_new_data_done(&data); + goto fail; + } + u->sink = pa_sink_new(m->core, &data, PA_SINK_LATENCY); pa_sink_new_data_done(&data); |