summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-05-24 20:52:22 +0000
committerDavid Robillard <d@drobilla.net>2011-05-24 20:52:22 +0000
commitc85f3ab4c7d4c1e793519a400f10fc8499459d80 (patch)
treee5ec7d84a6ea3c437c0fc555d4c7dda96c84c196 /src/server
parenta63ca8cb96f95849c42250500f327e0fa2f2f850 (diff)
downloadingen-c85f3ab4c7d4c1e793519a400f10fc8499459d80.tar.gz
ingen-c85f3ab4c7d4c1e793519a400f10fc8499459d80.tar.bz2
ingen-c85f3ab4c7d4c1e793519a400f10fc8499459d80.zip
Remove use of ingen-config.h in soon-to-be-public headers.
Make Lilv dependency mandatory. Reduce dependency on ingen-config.h. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3316 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server')
-rw-r--r--src/server/AudioBuffer.cpp1
-rw-r--r--src/server/InternalPlugin.hpp2
-rw-r--r--src/server/LV2Info.hpp6
-rw-r--r--src/server/LV2Plugin.hpp6
-rw-r--r--src/server/NodeFactory.cpp22
-rw-r--r--src/server/NodeFactory.hpp10
-rw-r--r--src/server/PatchImpl.cpp1
-rw-r--r--src/server/PatchPlugin.hpp2
-rw-r--r--src/server/events.hpp2
-rw-r--r--src/server/ingen_lv2.cpp2
-rw-r--r--src/server/internals/Delay.cpp1
-rw-r--r--src/server/wscript6
12 files changed, 10 insertions, 51 deletions
diff --git a/src/server/AudioBuffer.cpp b/src/server/AudioBuffer.cpp
index f255ec2f..27b78cfb 100644
--- a/src/server/AudioBuffer.cpp
+++ b/src/server/AudioBuffer.cpp
@@ -20,7 +20,6 @@
#include "raul/log.hpp"
#include "raul/SharedPtr.hpp"
#include "lv2/lv2plug.in/ns/ext/atom/atom.h"
-#include "ingen-config.h"
#include "AudioBuffer.hpp"
#include "ProcessContext.hpp"
#include "LV2Features.hpp"
diff --git a/src/server/InternalPlugin.hpp b/src/server/InternalPlugin.hpp
index be1df1d0..1b0de55b 100644
--- a/src/server/InternalPlugin.hpp
+++ b/src/server/InternalPlugin.hpp
@@ -18,8 +18,6 @@
#ifndef INGEN_ENGINE_INTERNALPLUGIN_HPP
#define INGEN_ENGINE_INTERNALPLUGIN_HPP
-#include "ingen-config.h"
-
#include <cstdlib>
#include <string>
diff --git a/src/server/LV2Info.hpp b/src/server/LV2Info.hpp
index 92d1e914..f40cde2c 100644
--- a/src/server/LV2Info.hpp
+++ b/src/server/LV2Info.hpp
@@ -18,13 +18,9 @@
#ifndef INGEN_ENGINE_LV2INFO_HPP
#define INGEN_ENGINE_LV2INFO_HPP
-#include "ingen-config.h"
-#ifndef HAVE_LILV
-#error "This file requires Lilv, but HAVE_LILV is not defined. Please report."
-#endif
-
#include <map>
#include <string>
+
#include "lilv/lilv.h"
#include "shared/World.hpp"
diff --git a/src/server/LV2Plugin.hpp b/src/server/LV2Plugin.hpp
index 6e25c671..6a284135 100644
--- a/src/server/LV2Plugin.hpp
+++ b/src/server/LV2Plugin.hpp
@@ -18,12 +18,6 @@
#ifndef INGEN_ENGINE_LV2PLUGIN_HPP
#define INGEN_ENGINE_LV2PLUGIN_HPP
-#include "ingen-config.h"
-
-#ifndef HAVE_LILV
-#error "This file requires Lilv, but HAVE_LILV is not defined. Please report."
-#endif
-
#include <cstdlib>
#include <string>
diff --git a/src/server/NodeFactory.cpp b/src/server/NodeFactory.cpp
index 590f2f86..408576e0 100644
--- a/src/server/NodeFactory.cpp
+++ b/src/server/NodeFactory.cpp
@@ -23,9 +23,9 @@
#include <glibmm/miscutils.h>
-#include "sord/sordmm.hpp"
-
+#include "lilv/lilv.h"
#include "raul/log.hpp"
+#include "sord/sordmm.hpp"
#include "internals/Controller.hpp"
#include "internals/Delay.hpp"
@@ -35,17 +35,12 @@
#include "Engine.hpp"
#include "InternalPlugin.hpp"
+#include "LV2Node.hpp"
+#include "LV2Plugin.hpp"
#include "NodeFactory.hpp"
#include "PatchImpl.hpp"
#include "ThreadManager.hpp"
-#include "ingen-config.h"
-#ifdef HAVE_LILV
-#include "lilv/lilv.h"
-#include "LV2Plugin.hpp"
-#include "LV2Node.hpp"
-#endif
-
using namespace std;
using namespace Raul;
@@ -57,9 +52,7 @@ using namespace Internals;
NodeFactory::NodeFactory(Ingen::Shared::World* world)
: _world(world)
, _has_loaded(false)
-#ifdef HAVE_LILV
, _lv2_info(new LV2Info(world))
-#endif
{
}
@@ -98,13 +91,8 @@ NodeFactory::load_plugins()
// if clients could refresh plugins list for whatever reason :/
if (!_has_loaded) {
_plugins.clear(); // FIXME: assert empty?
-
load_internal_plugins();
-
-#ifdef HAVE_LILV
load_lv2_plugins();
-#endif
-
_has_loaded = true;
}
}
@@ -126,7 +114,6 @@ NodeFactory::load_internal_plugins()
_plugins.insert(make_pair(trigger_plug->uri(), trigger_plug));
}
-#ifdef HAVE_LILV
/** Loads information about all LV2 plugins into internal plugin database.
*/
void
@@ -147,7 +134,6 @@ NodeFactory::load_lv2_plugins()
_plugins.insert(make_pair(uri, plugin));
}
}
-#endif // HAVE_LILV
} // namespace Server
} // namespace Ingen
diff --git a/src/server/NodeFactory.hpp b/src/server/NodeFactory.hpp
index 8021cbdc..b3aff687 100644
--- a/src/server/NodeFactory.hpp
+++ b/src/server/NodeFactory.hpp
@@ -23,7 +23,6 @@
#include "raul/SharedPtr.hpp"
#include "raul/URI.hpp"
-#include "ingen-config.h"
#include "shared/World.hpp"
namespace Ingen {
@@ -32,9 +31,7 @@ namespace Server {
class NodeImpl;
class PatchImpl;
class PluginImpl;
-#ifdef HAVE_LILV
class LV2Info;
-#endif
/** Discovers and loads plugin libraries.
*
@@ -54,18 +51,15 @@ public:
PluginImpl* plugin(const Raul::URI& uri);
private:
-#ifdef HAVE_LILV
void load_lv2_plugins();
-#endif
-
void load_internal_plugins();
Plugins _plugins;
Ingen::Shared::World* _world;
bool _has_loaded;
-#ifdef HAVE_LILV
+
SharedPtr<LV2Info> _lv2_info;
-#endif
+
};
} // namespace Server
diff --git a/src/server/PatchImpl.cpp b/src/server/PatchImpl.cpp
index 52060ab1..fb24faf7 100644
--- a/src/server/PatchImpl.cpp
+++ b/src/server/PatchImpl.cpp
@@ -31,7 +31,6 @@
#include "Engine.hpp"
#include "ProcessSlave.hpp"
#include "Driver.hpp"
-#include "ingen-config.h"
using namespace std;
using namespace Raul;
diff --git a/src/server/PatchPlugin.hpp b/src/server/PatchPlugin.hpp
index 72885c7d..3504730f 100644
--- a/src/server/PatchPlugin.hpp
+++ b/src/server/PatchPlugin.hpp
@@ -18,8 +18,6 @@
#ifndef INGEN_ENGINE_PATCHPLUGIN_HPP
#define INGEN_ENGINE_PATCHPLUGIN_HPP
-#include "ingen-config.h"
-
#include <string>
#include "PluginImpl.hpp"
diff --git a/src/server/events.hpp b/src/server/events.hpp
index 7ddcfe52..acb07b81 100644
--- a/src/server/events.hpp
+++ b/src/server/events.hpp
@@ -18,8 +18,6 @@
#ifndef INGEN_ENGINE_EVENTS_HPP
#define INGEN_ENGINE_EVENTS_HPP
-#include "ingen-config.h"
-
#include "events/Connect.hpp"
#include "events/CreateNode.hpp"
#include "events/CreatePatch.hpp"
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index 9ef1aede..4419a884 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -45,8 +45,6 @@
#include "shared/Configuration.hpp"
#include "shared/runtime_paths.hpp"
-#include "ingen-config.h"
-
/** Record of a patch in this Ingen LV2 bundle */
struct LV2Patch {
LV2Patch(const std::string& u, const std::string& f);
diff --git a/src/server/internals/Delay.cpp b/src/server/internals/Delay.cpp
index 5c2758da..4175862c 100644
--- a/src/server/internals/Delay.cpp
+++ b/src/server/internals/Delay.cpp
@@ -31,7 +31,6 @@
#include "OutputPort.hpp"
#include "PatchImpl.hpp"
#include "ProcessContext.hpp"
-#include "ingen-config.h"
#include "util.hpp"
#define LOG(s) s << "[DelayNode] "
diff --git a/src/server/wscript b/src/server/wscript
index daf7820e..1ce147d2 100644
--- a/src/server/wscript
+++ b/src/server/wscript
@@ -21,6 +21,9 @@ def build(bld):
GraphObjectImpl.cpp
InputPort.cpp
InternalPlugin.cpp
+ LV2Info.cpp
+ LV2Node.cpp
+ LV2Plugin.cpp
MessageContext.cpp
NodeFactory.cpp
NodeImpl.cpp
@@ -59,9 +62,6 @@ def build(bld):
internals/Trigger.cpp
'''
- if bld.is_defined('HAVE_LILV'):
- core_source += ' LV2Info.cpp LV2Plugin.cpp LV2Node.cpp '
-
obj = bld(features = 'cxx cxxshlib')
obj.source = core_source
obj.export_includes = ['.']