mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add "support" for plugins that have control output ports, i.e. don't crash on them anymore (the plugins correctly assume that every port is connected to a buffer, so we connect them to a dummy buffer that isn't used anywhere).

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1952 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Tanu Kaskinen 2007-10-25 05:49:11 +00:00
parent 81ed6e6c6f
commit 7ccf40ee3b
1 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/modules/module-ladspa-sink.c
View file

@ -21,6 +21,9 @@
USA. USA.
***/ ***/
/* TODO: Some plugins cause latency, and some even report it by using a control
out port. We don't currently use the latency information. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
@ -71,6 +74,10 @@ struct userdata {
unsigned long input_port, output_port; unsigned long input_port, output_port;
LADSPA_Data *control; LADSPA_Data *control;
/* This is a dummy buffer. Every port must be connected, but we don't care
about control out ports. We connect them all to this single buffer. */
LADSPA_Data control_out;
pa_memchunk memchunk; pa_memchunk memchunk;
}; };
@ -386,8 +393,10 @@ int pa__init(pa_module*m) {
} else if (LADSPA_IS_PORT_INPUT(d->PortDescriptors[p]) && LADSPA_IS_PORT_CONTROL(d->PortDescriptors[p])) } else if (LADSPA_IS_PORT_INPUT(d->PortDescriptors[p]) && LADSPA_IS_PORT_CONTROL(d->PortDescriptors[p]))
n_control++; n_control++;
else else {
pa_log("Cannot handle type of port %s", d->PortNames[p]); pa_assert(LADSPA_IS_PORT_OUTPUT(d->PortDescriptors[p]) && LADSPA_IS_PORT_CONTROL(d->PortDescriptors[p]));
pa_log_info("Ignored port \"%s\", because we ignore all control out ports.", d->PortNames[p]);
}
} }
if ((input_port == (unsigned long) -1) || (output_port == (unsigned long) -1)) { if ((input_port == (unsigned long) -1) || (output_port == (unsigned long) -1)) {
@ -466,9 +475,15 @@ int pa__init(pa_module*m) {
for (p = 0; p < d->PortCount; p++) { for (p = 0; p < d->PortCount; p++) {
LADSPA_PortRangeHintDescriptor hint = d->PortRangeHints[p].HintDescriptor; LADSPA_PortRangeHintDescriptor hint = d->PortRangeHints[p].HintDescriptor;
if (!LADSPA_IS_PORT_INPUT(d->PortDescriptors[p]) || !LADSPA_IS_PORT_CONTROL(d->PortDescriptors[p])) if (!LADSPA_IS_PORT_CONTROL(d->PortDescriptors[p]))
continue; continue;
if (LADSPA_IS_PORT_OUTPUT(d->PortDescriptors[p])) {
for (c = 0; c < ss.channels; c++)
d->connect_port(u->handle[c], p, &u->control_out);
continue;
}
pa_assert(h < n_control); pa_assert(h < n_control);
if (use_default[h]) { if (use_default[h]) {