diff options
| author | Tanu Kaskinen <tanu.kaskinen@digia.com> | 2011-02-24 16:16:40 +0200 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2011-02-26 10:38:28 +0000 |
| commit | d2d36beb801cc78b53ea1942634c158882604432 (patch) | |
| tree | 5f0614ed6fd5c6a15f83c4d92371bd36bf44f2dd /src/modules/module-virtual-sink.c | |
| parent | 8702d15d0303fdb53e9aaf66656610741728d2e3 (diff) | |
virtual-sink: Add a modarg for forcing flat volume.
Diffstat (limited to 'src/modules/module-virtual-sink.c')
| -rw-r--r-- | src/modules/module-virtual-sink.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/modules/module-virtual-sink.c b/src/modules/module-virtual-sink.c index ceb26977..e55e8906 100644 --- a/src/modules/module-virtual-sink.c +++ b/src/modules/module-virtual-sink.c @@ -58,6 +58,7 @@ PA_MODULE_USAGE( "channels=<number of channels> " "channel_map=<channel map> " "use_volume_sharing=<yes or no> " + "force_flat_volume=<yes or no> " )); #define MEMBLOCKQ_MAXLENGTH (16*1024*1024) @@ -83,6 +84,7 @@ static const char* const valid_modargs[] = { "channels", "channel_map", "use_volume_sharing", + "force_flat_volume", NULL }; @@ -481,6 +483,7 @@ int pa__init(pa_module*m) { pa_sink_new_data sink_data; pa_bool_t *use_default = NULL; pa_bool_t use_volume_sharing = FALSE; + pa_bool_t force_flat_volume = FALSE; pa_assert(m); @@ -509,6 +512,16 @@ int pa__init(pa_module*m) { goto fail; } + if (pa_modargs_get_value_boolean(ma, "force_flat_volume", &force_flat_volume) < 0) { + pa_log("force_flat_volume= expects a boolean argument"); + goto fail; + } + + if (use_volume_sharing && force_flat_volume) { + pa_log("Flat volume can't be forced when using volume sharing."); + goto fail; + } + u = pa_xnew0(struct userdata, 1); u->module = m; m->userdata = u; @@ -540,7 +553,8 @@ int pa__init(pa_module*m) { } u->sink = pa_sink_new(m->core, &sink_data, (master->flags & (PA_SINK_LATENCY|PA_SINK_DYNAMIC_LATENCY)) - | (use_volume_sharing ? PA_SINK_SHARE_VOLUME_WITH_MASTER : 0)); + | (use_volume_sharing ? PA_SINK_SHARE_VOLUME_WITH_MASTER : 0) + | (force_flat_volume ? PA_SINK_FLAT_VOLUME : 0)); pa_sink_new_data_done(&sink_data); if (!u->sink) { |