summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libs/client/NodeModel.h1
-rw-r--r--src/libs/engine/AlsaMidiDriver.cpp2
-rw-r--r--src/libs/engine/JackMidiDriver.cpp2
-rw-r--r--src/libs/engine/NodeFactory.cpp14
-rw-r--r--src/libs/engine/QueuedEngineInterface.cpp3
5 files changed, 12 insertions, 10 deletions
diff --git a/src/libs/client/NodeModel.h b/src/libs/client/NodeModel.h
index 2bce6656..71c77022 100644
--- a/src/libs/client/NodeModel.h
+++ b/src/libs/client/NodeModel.h
@@ -75,7 +75,6 @@ protected:
void add_program(int bank, int program, const string& name);
void remove_program(int bank, int program);
- //void plugin(CountedPtr<PluginModel> p) { m_plugin = p; }
virtual void clear();
friend class PatchModel;
diff --git a/src/libs/engine/AlsaMidiDriver.cpp b/src/libs/engine/AlsaMidiDriver.cpp
index e516f1ac..78d032be 100644
--- a/src/libs/engine/AlsaMidiDriver.cpp
+++ b/src/libs/engine/AlsaMidiDriver.cpp
@@ -288,7 +288,7 @@ AlsaMidiDriver::deactivate()
}
-/** Build flat arrays of events for DSSI plugins for each Port.
+/** Build flat arrays of events to be used as input for the given cycle.
*/
void
AlsaMidiDriver::prepare_block(const SampleCount block_start, const SampleCount block_end)
diff --git a/src/libs/engine/JackMidiDriver.cpp b/src/libs/engine/JackMidiDriver.cpp
index c2a5ca4a..9310d1a6 100644
--- a/src/libs/engine/JackMidiDriver.cpp
+++ b/src/libs/engine/JackMidiDriver.cpp
@@ -155,7 +155,7 @@ JackMidiDriver::deactivate()
}
-/** Build flat arrays of events for DSSI plugins for each Port.
+/** Build flat arrays of events to be used as input for the given cycle.
*/
void
JackMidiDriver::prepare_block(const SampleCount block_start, const SampleCount block_end)
diff --git a/src/libs/engine/NodeFactory.cpp b/src/libs/engine/NodeFactory.cpp
index 33b1842d..ca762678 100644
--- a/src/libs/engine/NodeFactory.cpp
+++ b/src/libs/engine/NodeFactory.cpp
@@ -114,13 +114,13 @@ NodeFactory::load_plugins()
_plugins.clear();
_plugins = _internal_plugins;
-#if HAVE_SLV2
+#ifdef HAVE_SLV2
load_lv2_plugins();
#endif
-#if HAVE_DSSI
+#ifdef HAVE_DSSI
load_dssi_plugins();
#endif
-#if HAVE_LADSPA
+#ifdef HAVE_LADSPA
load_ladspa_plugins();
#endif
@@ -182,17 +182,17 @@ NodeFactory::load_plugin(const Plugin* a_plugin,
}
switch (a_plugin->type()) {
-#if HAVE_SLV2
+#ifdef HAVE_SLV2
case Plugin::LV2:
r = load_lv2_plugin(plugin->uri(), name, poly, parent, srate, buffer_size);
break;
#endif
-#if HAVE_DSSI
+#ifdef HAVE_DSSI
case Plugin::DSSI:
r = load_dssi_plugin(plugin->uri(), name, poly, parent, srate, buffer_size);
break;
#endif
-#if HAVE_LADSPA
+#ifdef HAVE_LADSPA
case Plugin::LADSPA:
r = load_ladspa_plugin(plugin->uri(), name, poly, parent, srate, buffer_size);
break;
@@ -318,7 +318,7 @@ NodeFactory::load_lv2_plugin(const string& plug_uri,
#endif // HAVE_SLV2
-#if HAVE_DSSI
+#ifdef HAVE_DSSI
/** Loads information about all DSSI plugins into internal plugin database.
*/
diff --git a/src/libs/engine/QueuedEngineInterface.cpp b/src/libs/engine/QueuedEngineInterface.cpp
index ce56e569..f8fc4827 100644
--- a/src/libs/engine/QueuedEngineInterface.cpp
+++ b/src/libs/engine/QueuedEngineInterface.cpp
@@ -15,6 +15,7 @@
*/
#include "QueuedEngineInterface.h"
+#include "config.h"
#include "QueuedEventSource.h"
#include "events.h"
#include "util/Queue.h"
@@ -258,7 +259,9 @@ QueuedEngineInterface::set_program(const string& node_path,
uint32_t bank,
uint32_t program)
{
+#ifdef HAVE_DSSI
push_queued(new DSSIProgramEvent(*_engine.get(), _responder, now(), node_path, bank, program));
+#endif
}