summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/LV2Info.cpp28
-rw-r--r--src/server/LV2Info.hpp22
-rw-r--r--src/server/LV2Node.cpp122
-rw-r--r--src/server/LV2Node.hpp4
-rw-r--r--src/server/LV2Plugin.cpp10
-rw-r--r--src/server/LV2Plugin.hpp12
-rw-r--r--src/server/NodeFactory.cpp22
-rw-r--r--src/server/NodeFactory.hpp6
-rw-r--r--src/server/wscript4
9 files changed, 115 insertions, 115 deletions
diff --git a/src/server/LV2Info.cpp b/src/server/LV2Info.cpp
index 6ce5792b..ea263f91 100644
--- a/src/server/LV2Info.cpp
+++ b/src/server/LV2Info.cpp
@@ -39,14 +39,14 @@ namespace Ingen {
namespace Server {
LV2Info::LV2Info(Ingen::Shared::World* world)
- : input_class(slv2_value_new_uri(world->slv2_world(), SLV2_PORT_CLASS_INPUT))
- , output_class(slv2_value_new_uri(world->slv2_world(), SLV2_PORT_CLASS_OUTPUT))
- , control_class(slv2_value_new_uri(world->slv2_world(), SLV2_PORT_CLASS_CONTROL))
- , audio_class(slv2_value_new_uri(world->slv2_world(), SLV2_PORT_CLASS_AUDIO))
- , event_class(slv2_value_new_uri(world->slv2_world(), SLV2_PORT_CLASS_EVENT))
- , value_port_class(slv2_value_new_uri(world->slv2_world(),
+ : input_class(lilv_value_new_uri(world->lilv_world(), LILV_PORT_CLASS_INPUT))
+ , output_class(lilv_value_new_uri(world->lilv_world(), LILV_PORT_CLASS_OUTPUT))
+ , control_class(lilv_value_new_uri(world->lilv_world(), LILV_PORT_CLASS_CONTROL))
+ , audio_class(lilv_value_new_uri(world->lilv_world(), LILV_PORT_CLASS_AUDIO))
+ , event_class(lilv_value_new_uri(world->lilv_world(), LILV_PORT_CLASS_EVENT))
+ , value_port_class(lilv_value_new_uri(world->lilv_world(),
"http://lv2plug.in/ns/ext/atom#ValuePort"))
- , message_port_class(slv2_value_new_uri(world->slv2_world(),
+ , message_port_class(lilv_value_new_uri(world->lilv_world(),
"http://lv2plug.in/ns/ext/atom#MessagePort"))
, _world(world)
{
@@ -64,13 +64,13 @@ LV2Info::LV2Info(Ingen::Shared::World* world)
LV2Info::~LV2Info()
{
- slv2_value_free(input_class);
- slv2_value_free(output_class);
- slv2_value_free(control_class);
- slv2_value_free(audio_class);
- slv2_value_free(event_class);
- slv2_value_free(value_port_class);
- slv2_value_free(message_port_class);
+ lilv_value_free(input_class);
+ lilv_value_free(output_class);
+ lilv_value_free(control_class);
+ lilv_value_free(audio_class);
+ lilv_value_free(event_class);
+ lilv_value_free(value_port_class);
+ lilv_value_free(message_port_class);
}
} // namespace Server
diff --git a/src/server/LV2Info.hpp b/src/server/LV2Info.hpp
index de252d82..4f3e45f1 100644
--- a/src/server/LV2Info.hpp
+++ b/src/server/LV2Info.hpp
@@ -19,13 +19,13 @@
#define INGEN_ENGINE_LV2INFO_HPP
#include "ingen-config.h"
-#ifndef HAVE_SLV2
-#error "This file requires SLV2, but HAVE_SLV2 is not defined. Please report."
+#ifndef HAVE_LILV
+#error "This file requires Lilv, but HAVE_LILV is not defined. Please report."
#endif
#include <map>
#include <string>
-#include "slv2/slv2.h"
+#include "lilv/lilv.h"
#include "shared/World.hpp"
namespace Ingen {
@@ -41,16 +41,16 @@ public:
explicit LV2Info(Ingen::Shared::World* world);
~LV2Info();
- SLV2Value input_class;
- SLV2Value output_class;
- SLV2Value control_class;
- SLV2Value audio_class;
- SLV2Value event_class;
- SLV2Value value_port_class;
- SLV2Value message_port_class;
+ LilvValue input_class;
+ LilvValue output_class;
+ LilvValue control_class;
+ LilvValue audio_class;
+ LilvValue event_class;
+ LilvValue value_port_class;
+ LilvValue message_port_class;
Ingen::Shared::World& world() { return *_world; }
- SLV2World lv2_world() { return _world->slv2_world(); }
+ LilvWorld lv2_world() { return _world->lilv_world(); }
private:
Ingen::Shared::World* _world;
diff --git a/src/server/LV2Node.cpp b/src/server/LV2Node.cpp
index 48d00a6d..04d48905 100644
--- a/src/server/LV2Node.cpp
+++ b/src/server/LV2Node.cpp
@@ -81,9 +81,9 @@ LV2Node::prepare_poly(BufferFactory& bufs, uint32_t poly)
_prepared_instances = new Instances(poly, *_instances, SharedPtr<void>());
for (uint32_t i = _polyphony; i < _prepared_instances->size(); ++i) {
_prepared_instances->at(i) = SharedPtr<void>(
- slv2_plugin_instantiate(
- _lv2_plugin->slv2_plugin(), _srate, _features->array()),
- slv2_instance_free);
+ lilv_plugin_instantiate(
+ _lv2_plugin->lilv_plugin(), _srate, _features->array()),
+ lilv_instance_free);
if (!_prepared_instances->at(i)) {
error << "Failed to instantiate plugin" << endl;
@@ -104,7 +104,7 @@ LV2Node::prepare_poly(BufferFactory& bufs, uint32_t poly)
}
if (_activated)
- slv2_instance_activate((SLV2Instance)(*_prepared_instances)[i].get());
+ lilv_instance_activate((LilvInstance)(*_prepared_instances)[i].get());
}
return true;
@@ -139,9 +139,9 @@ LV2Node::instantiate(BufferFactory& bufs)
{
const Ingen::Shared::LV2URIMap& uris = bufs.uris();
SharedPtr<LV2Info> info = _lv2_plugin->lv2_info();
- SLV2Plugin plug = _lv2_plugin->slv2_plugin();
+ LilvPlugin plug = _lv2_plugin->lilv_plugin();
- uint32_t num_ports = slv2_plugin_get_num_ports(plug);
+ uint32_t num_ports = lilv_plugin_get_num_ports(plug);
assert(num_ports > 0);
_ports = new Raul::Array<PortImpl*>(num_ports, NULL);
@@ -150,13 +150,13 @@ LV2Node::instantiate(BufferFactory& bufs)
_features = info->world().lv2_features()->lv2_features(&info->world(), this);
uint32_t port_buffer_size = 0;
- SLV2Value ctx_ext_uri = slv2_value_new_uri(info->lv2_world(),
+ LilvValue ctx_ext_uri = lilv_value_new_uri(info->lv2_world(),
LV2_CONTEXTS_URI "#MessageContext");
for (uint32_t i = 0; i < _polyphony; ++i) {
(*_instances)[i] = SharedPtr<void>(
- slv2_plugin_instantiate(plug, _srate, _features->array()),
- slv2_instance_free);
+ lilv_plugin_instantiate(plug, _srate, _features->array()),
+ lilv_instance_free);
if (!instance(i)) {
error << "Failed to instantiate plugin " << _lv2_plugin->uri()
@@ -164,10 +164,10 @@ LV2Node::instantiate(BufferFactory& bufs)
return false;
}
- if (!slv2_plugin_has_feature(plug, ctx_ext_uri))
+ if (!lilv_plugin_has_feature(plug, ctx_ext_uri))
continue;
- const void* ctx_ext = slv2_instance_get_extension_data(
+ const void* ctx_ext = lilv_instance_get_extension_data(
instance(i), LV2_CONTEXTS_URI "#MessageContext");
if (i == 0 && ctx_ext) {
@@ -176,7 +176,7 @@ LV2Node::instantiate(BufferFactory& bufs)
}
}
- slv2_value_free(ctx_ext_uri);
+ lilv_value_free(ctx_ext_uri);
string port_name;
Path port_path;
@@ -187,31 +187,31 @@ LV2Node::instantiate(BufferFactory& bufs)
float* min_values = new float[num_ports];
float* max_values = new float[num_ports];
float* def_values = new float[num_ports];
- slv2_plugin_get_port_ranges_float(plug, min_values, max_values, def_values);
+ lilv_plugin_get_port_ranges_float(plug, min_values, max_values, def_values);
- SLV2Value context_pred = slv2_value_new_uri(info->lv2_world(),
+ LilvValue context_pred = lilv_value_new_uri(info->lv2_world(),
"http://lv2plug.in/ns/ext/contexts#context");
- SLV2Value default_pred = slv2_value_new_uri(info->lv2_world(),
+ LilvValue default_pred = lilv_value_new_uri(info->lv2_world(),
"http://lv2plug.in/ns/lv2core#default");
- SLV2Value min_size_pred = slv2_value_new_uri(info->lv2_world(),
+ LilvValue min_size_pred = lilv_value_new_uri(info->lv2_world(),
"http://lv2plug.in/ns/ext/resize-port#minimumSize");
- SLV2Value port_property_pred = slv2_value_new_uri(info->lv2_world(),
+ LilvValue port_property_pred = lilv_value_new_uri(info->lv2_world(),
"http://lv2plug.in/ns/lv2core#portProperty");
- SLV2Value supports_pred = slv2_value_new_uri(info->lv2_world(),
+ LilvValue supports_pred = lilv_value_new_uri(info->lv2_world(),
"http://lv2plug.in/ns/ext/atom#supports");
- //SLV2Value as_large_as_pred = slv2_value_new_uri(info->lv2_world(),
+ //LilvValue as_large_as_pred = lilv_value_new_uri(info->lv2_world(),
// "http://lv2plug.in/ns/ext/resize-port#asLargeAs");
for (uint32_t j = 0; j < num_ports; ++j) {
- SLV2Port id = slv2_plugin_get_port_by_index(plug, j);
+ LilvPort id = lilv_plugin_get_port_by_index(plug, j);
// LV2 port symbols are guaranteed to be unique, valid C identifiers
- port_name = slv2_value_as_string(slv2_port_get_symbol(plug, id));
+ port_name = lilv_value_as_string(lilv_port_get_symbol(plug, id));
if (!Symbol::is_valid(port_name)) {
error << "Plugin " << _lv2_plugin->uri() << " port " << j
@@ -226,15 +226,15 @@ LV2Node::instantiate(BufferFactory& bufs)
Raul::Atom val;
PortType data_type = PortType::UNKNOWN;
- if (slv2_port_is_a(plug, id, info->control_class)) {
+ if (lilv_port_is_a(plug, id, info->control_class)) {
data_type = PortType::CONTROL;
- } else if (slv2_port_is_a(plug, id, info->audio_class)) {
+ } else if (lilv_port_is_a(plug, id, info->audio_class)) {
data_type = PortType::AUDIO;
- } else if (slv2_port_is_a(plug, id, info->event_class)) {
+ } else if (lilv_port_is_a(plug, id, info->event_class)) {
data_type = PortType::EVENTS;
- } else if (slv2_port_is_a(plug, id, info->value_port_class)) {
+ } else if (lilv_port_is_a(plug, id, info->value_port_class)) {
data_type = PortType::VALUE;
- } else if (slv2_port_is_a(plug, id, info->message_port_class)) {
+ } else if (lilv_port_is_a(plug, id, info->message_port_class)) {
data_type = PortType::MESSAGE;
}
@@ -242,11 +242,11 @@ LV2Node::instantiate(BufferFactory& bufs)
if (data_type == PortType::VALUE || data_type == PortType::MESSAGE) {
// Get default value, and its length
- SLV2Values defaults = slv2_port_get_value(plug, id, default_pred);
- SLV2_FOREACH(values, i, defaults) {
- SLV2Value d = slv2_values_get(defaults, i);
- if (slv2_value_is_string(d)) {
- const char* str_val = slv2_value_as_string(d);
+ LilvValues defaults = lilv_port_get_value(plug, id, default_pred);
+ LILV_FOREACH(values, i, defaults) {
+ LilvValue d = lilv_values_get(defaults, i);
+ if (lilv_value_is_string(d)) {
+ const char* str_val = lilv_value_as_string(d);
const size_t str_val_len = strlen(str_val);
val = str_val;
port_buffer_size = str_val_len;
@@ -254,20 +254,20 @@ LV2Node::instantiate(BufferFactory& bufs)
}
// Get minimum size, if set in data
- SLV2Values sizes = slv2_port_get_value(plug, id, min_size_pred);
- SLV2_FOREACH(values, i, sizes) {
- SLV2Value d = slv2_values_get(sizes, i);
- if (slv2_value_is_int(d)) {
- size_t size_val = slv2_value_as_int(d);
+ LilvValues sizes = lilv_port_get_value(plug, id, min_size_pred);
+ LILV_FOREACH(values, i, sizes) {
+ LilvValue d = lilv_values_get(sizes, i);
+ if (lilv_value_is_int(d)) {
+ size_t size_val = lilv_value_as_int(d);
port_buffer_size = size_val;
}
}
}
enum { UNKNOWN, INPUT, OUTPUT } direction = UNKNOWN;
- if (slv2_port_is_a(plug, id, info->input_class)) {
+ if (lilv_port_is_a(plug, id, info->input_class)) {
direction = INPUT;
- } else if (slv2_port_is_a(plug, id, info->output_class)) {
+ } else if (lilv_port_is_a(plug, id, info->output_class)) {
direction = OUTPUT;
}
@@ -296,27 +296,27 @@ LV2Node::instantiate(BufferFactory& bufs)
}
// Set lv2:portProperty properties
- SLV2Values properties = slv2_port_get_value(plug, id, port_property_pred);
- SLV2_FOREACH(values, i, properties) {
- SLV2Value p = slv2_values_get(properties, i);
- if (slv2_value_is_uri(p)) {
- port->set_property(uris.lv2_portProperty, Raul::URI(slv2_value_as_uri(p)));
+ LilvValues properties = lilv_port_get_value(plug, id, port_property_pred);
+ LILV_FOREACH(values, i, properties) {
+ LilvValue p = lilv_values_get(properties, i);
+ if (lilv_value_is_uri(p)) {
+ port->set_property(uris.lv2_portProperty, Raul::URI(lilv_value_as_uri(p)));
}
}
// Set atom:supports properties
- SLV2Values types = slv2_port_get_value(plug, id, supports_pred);
- SLV2_FOREACH(values, i, types) {
- SLV2Value type = slv2_values_get(types, i);
- if (slv2_value_is_uri(type)) {
- port->add_property(uris.atom_supports, Raul::URI(slv2_value_as_uri(type)));
+ LilvValues types = lilv_port_get_value(plug, id, supports_pred);
+ LILV_FOREACH(values, i, types) {
+ LilvValue type = lilv_values_get(types, i);
+ if (lilv_value_is_uri(type)) {
+ port->add_property(uris.atom_supports, Raul::URI(lilv_value_as_uri(type)));
}
}
- SLV2Values contexts = slv2_port_get_value(plug, id, context_pred);
- SLV2_FOREACH(values, i, contexts) {
- SLV2Value c = slv2_values_get(contexts, i);
- const char* context = slv2_value_as_string(c);
+ LilvValues contexts = lilv_port_get_value(plug, id, context_pred);
+ LILV_FOREACH(values, i, contexts) {
+ LilvValue c = lilv_values_get(contexts, i);
+ const char* context = lilv_value_as_string(c);
if (!strcmp(LV2_CONTEXTS_URI "#MessageContext", context)) {
if (!_message_funcs) {
warn << _lv2_plugin->uri()
@@ -325,7 +325,7 @@ LV2Node::instantiate(BufferFactory& bufs)
port->set_context(Context::MESSAGE);
} else {
warn << _lv2_plugin->uri() << " port " << i << " has unknown context "
- << slv2_value_as_string(c)
+ << lilv_value_as_string(c)
<< endl;
}
}
@@ -343,10 +343,10 @@ LV2Node::instantiate(BufferFactory& bufs)
delete[] min_values;
delete[] max_values;
delete[] def_values;
- slv2_value_free(context_pred);
- slv2_value_free(default_pred);
- slv2_value_free(min_size_pred);
- slv2_value_free(port_property_pred);
+ lilv_value_free(context_pred);
+ lilv_value_free(default_pred);
+ lilv_value_free(min_size_pred);
+ lilv_value_free(port_property_pred);
return ret;
}
@@ -357,7 +357,7 @@ LV2Node::activate(BufferFactory& bufs)
NodeImpl::activate(bufs);
for (uint32_t i = 0; i < _polyphony; ++i)
- slv2_instance_activate(instance(i));
+ lilv_instance_activate(instance(i));
}
void
@@ -366,7 +366,7 @@ LV2Node::deactivate()
NodeImpl::deactivate();
for (uint32_t i = 0; i < _polyphony; ++i)
- slv2_instance_deactivate(instance(i));
+ lilv_instance_deactivate(instance(i));
}
void
@@ -391,7 +391,7 @@ LV2Node::process(ProcessContext& context)
NodeImpl::pre_process(context);
for (uint32_t i = 0; i < _polyphony; ++i)
- slv2_instance_run(instance(i), context.nframes());
+ lilv_instance_run(instance(i), context.nframes());
NodeImpl::post_process(context);
}
@@ -401,7 +401,7 @@ LV2Node::set_port_buffer(uint32_t voice, uint32_t port_num,
IntrusivePtr<Buffer> buf, SampleCount offset)
{
NodeImpl::set_port_buffer(voice, port_num, buf, offset);
- slv2_instance_connect_port(instance(voice), port_num,
+ lilv_instance_connect_port(instance(voice), port_num,
buf ? buf->port_data(_ports->at(port_num)->buffer_type(), offset) : NULL);
}
diff --git a/src/server/LV2Node.hpp b/src/server/LV2Node.hpp
index 4702d24d..29a9d717 100644
--- a/src/server/LV2Node.hpp
+++ b/src/server/LV2Node.hpp
@@ -19,7 +19,7 @@
#define INGEN_ENGINE_LV2NODE_HPP
#include <string>
-#include "slv2/slv2.h"
+#include "lilv/lilv.h"
#include "raul/IntrusivePtr.hpp"
#include "lv2/lv2plug.in/ns/ext/contexts/contexts.h"
#include "types.hpp"
@@ -62,7 +62,7 @@ public:
IntrusivePtr<Buffer> buf, SampleCount offset);
protected:
- inline SLV2Instance instance(uint32_t voice) { return (SLV2Instance)(*_instances)[voice].get(); }
+ inline LilvInstance instance(uint32_t voice) { return (LilvInstance)(*_instances)[voice].get(); }
typedef Raul::Array< SharedPtr<void> > Instances;
diff --git a/src/server/LV2Plugin.cpp b/src/server/LV2Plugin.cpp
index 703a8616..75476fa4 100644
--- a/src/server/LV2Plugin.cpp
+++ b/src/server/LV2Plugin.cpp
@@ -38,7 +38,7 @@ namespace Server {
LV2Plugin::LV2Plugin(SharedPtr<LV2Info> lv2_info, const std::string& uri)
: PluginImpl(*lv2_info->world().uris().get(), Plugin::LV2, uri)
- , _slv2_plugin(NULL)
+ , _lilv_plugin(NULL)
, _lv2_info(lv2_info)
{
set_property(_uris.rdf_type, _uris.lv2_Plugin);
@@ -86,9 +86,9 @@ LV2Plugin::instantiate(BufferFactory& bufs,
}
void
-LV2Plugin::slv2_plugin(SLV2Plugin p)
+LV2Plugin::lilv_plugin(LilvPlugin p)
{
- _slv2_plugin = p;
+ _lilv_plugin = p;
}
const std::string&
@@ -96,9 +96,9 @@ LV2Plugin::library_path() const
{
static const std::string empty_string;
if (_library_path.empty()) {
- SLV2Value v = slv2_plugin_get_library_uri(_slv2_plugin);
+ LilvValue v = lilv_plugin_get_library_uri(_lilv_plugin);
if (v) {
- _library_path = slv2_uri_to_path(slv2_value_as_uri(v));
+ _library_path = lilv_uri_to_path(lilv_value_as_uri(v));
} else {
Raul::warn << uri() << " has no library path" << std::endl;
return empty_string;
diff --git a/src/server/LV2Plugin.hpp b/src/server/LV2Plugin.hpp
index e4360398..127300cf 100644
--- a/src/server/LV2Plugin.hpp
+++ b/src/server/LV2Plugin.hpp
@@ -20,8 +20,8 @@
#include "ingen-config.h"
-#ifndef HAVE_SLV2
-#error "This file requires SLV2, but HAVE_SLV2 is not defined. Please report."
+#ifndef HAVE_LILV
+#error "This file requires Lilv, but HAVE_LILV is not defined. Please report."
#endif
#include <cstdlib>
@@ -30,7 +30,7 @@
#include <glibmm/module.h>
#include <boost/utility.hpp>
-#include "slv2/slv2.h"
+#include "lilv/lilv.h"
#include "raul/SharedPtr.hpp"
#include "PluginImpl.hpp"
@@ -61,11 +61,11 @@ public:
const std::string& library_path() const;
- SLV2Plugin slv2_plugin() const { return _slv2_plugin; }
- void slv2_plugin(SLV2Plugin p);
+ LilvPlugin lilv_plugin() const { return _lilv_plugin; }
+ void lilv_plugin(LilvPlugin p);
private:
- SLV2Plugin _slv2_plugin;
+ LilvPlugin _lilv_plugin;
SharedPtr<LV2Info> _lv2_info;
};
diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp
index 8b336ad2..90e1a84e 100644
--- a/src/server/NodeFactory.cpp
+++ b/src/server/NodeFactory.cpp
@@ -35,8 +35,8 @@
#include "NodeFactory.hpp"
#include "PatchImpl.hpp"
#include "ThreadManager.hpp"
-#ifdef HAVE_SLV2
-#include "slv2/slv2.h"
+#ifdef HAVE_LILV
+#include "lilv/lilv.h"
#include "LV2Plugin.hpp"
#include "LV2Node.hpp"
#endif
@@ -52,7 +52,7 @@ using namespace Internals;
NodeFactory::NodeFactory(Ingen::Shared::World* world)
: _world(world)
, _has_loaded(false)
-#ifdef HAVE_SLV2
+#ifdef HAVE_LILV
, _lv2_info(new LV2Info(world))
#endif
{
@@ -96,7 +96,7 @@ NodeFactory::load_plugins()
load_internal_plugins();
-#ifdef HAVE_SLV2
+#ifdef HAVE_LILV
load_lv2_plugins();
#endif
@@ -121,28 +121,28 @@ NodeFactory::load_internal_plugins()
_plugins.insert(make_pair(trigger_plug->uri(), trigger_plug));
}
-#ifdef HAVE_SLV2
+#ifdef HAVE_LILV
/** Loads information about all LV2 plugins into internal plugin database.
*/
void
NodeFactory::load_lv2_plugins()
{
- SLV2Plugins plugins = slv2_world_get_all_plugins(_world->slv2_world());
+ LilvPlugins plugins = lilv_world_get_all_plugins(_world->lilv_world());
- SLV2_FOREACH(plugins, i, plugins) {
- SLV2Plugin lv2_plug = slv2_plugins_get(plugins, i);
+ LILV_FOREACH(plugins, i, plugins) {
+ LilvPlugin lv2_plug = lilv_plugins_get(plugins, i);
- const string uri(slv2_value_as_uri(slv2_plugin_get_uri(lv2_plug)));
+ const string uri(lilv_value_as_uri(lilv_plugin_get_uri(lv2_plug)));
assert(_plugins.find(uri) == _plugins.end());
LV2Plugin* const plugin = new LV2Plugin(_lv2_info, uri);
- plugin->slv2_plugin(lv2_plug);
+ plugin->lilv_plugin(lv2_plug);
_plugins.insert(make_pair(uri, plugin));
}
}
-#endif // HAVE_SLV2
+#endif // HAVE_LILV
} // namespace Server
} // namespace Ingen
diff --git a/src/server/NodeFactory.hpp b/src/server/NodeFactory.hpp
index f4e4ea41..d81639cc 100644
--- a/src/server/NodeFactory.hpp
+++ b/src/server/NodeFactory.hpp
@@ -34,7 +34,7 @@ namespace Server {
class NodeImpl;
class PatchImpl;
class PluginImpl;
-#ifdef HAVE_SLV2
+#ifdef HAVE_LILV
class LV2Info;
#endif
@@ -56,7 +56,7 @@ public:
PluginImpl* plugin(const Raul::URI& uri);
private:
-#ifdef HAVE_SLV2
+#ifdef HAVE_LILV
void load_lv2_plugins();
#endif
@@ -65,7 +65,7 @@ private:
Plugins _plugins;
Ingen::Shared::World* _world;
bool _has_loaded;
-#ifdef HAVE_SLV2
+#ifdef HAVE_LILV
SharedPtr<LV2Info> _lv2_info;
#endif
};
diff --git a/src/server/wscript b/src/server/wscript
index b4d3be3b..daf7820e 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -59,7 +59,7 @@ def build(bld):
internals/Trigger.cpp
'''
- if bld.is_defined('HAVE_SLV2'):
+ if bld.is_defined('HAVE_LILV'):
core_source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
obj = bld(features = 'cxx cxxshlib')
@@ -70,7 +70,7 @@ def build(bld):
obj.target = 'ingen_server'
obj.install_path = '${LIBDIR}'
obj.use = 'libingen_shared'
- core_libs = 'GLIBMM GTHREAD LV2CORE SLV2 RAUL SORD'
+ core_libs = 'GLIBMM GTHREAD LV2CORE LILV RAUL SORD'
autowaf.use_lib(bld, obj, core_libs)
if bld.is_defined('HAVE_SOUP'):
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 03:05:16 +0000