summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/JackDriver.cpp4
-rw-r--r--src/server/ingen_lv2.cpp8
2 files changed, 4 insertions, 8 deletions
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index 3452c163..efe19169 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -23,7 +23,7 @@
#ifdef INGEN_JACK_SESSION
#include <jack/session.h>
#include <boost/format.hpp>
-#include "ingen/serialisation/Serialiser.hpp"
+#include "ingen/Serialiser.hpp"
#endif
#ifdef HAVE_JACK_METADATA
#include <jack/metadata.h>
@@ -525,7 +525,7 @@ JackDriver::_session_cb(jack_session_event_t* event)
% jack_get_client_name(_client)
% event->client_uuid).str();
- SPtr<Serialisation::Serialiser> serialiser = _engine.world()->serialiser();
+ SPtr<Serialiser> serialiser = _engine.world()->serialiser();
if (serialiser) {
SPtr<Node> root(_engine.root_graph(), NullDeleter<Node>);
serialiser->write_bundle(root, string("file://") + event->session_dir);
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index cf81fd73..596e24e6 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -34,12 +34,12 @@
#include "ingen/Configuration.hpp"
#include "ingen/Interface.hpp"
#include "ingen/Log.hpp"
+#include "ingen/Parser.hpp"
+#include "ingen/Serialiser.hpp"
#include "ingen/Store.hpp"
#include "ingen/World.hpp"
#include "ingen/ingen.h"
#include "ingen/runtime_paths.hpp"
-#include "ingen/serialisation/Parser.hpp"
-#include "ingen/serialisation/Serialiser.hpp"
#include "ingen/types.hpp"
#include "raul/Semaphore.hpp"
@@ -539,10 +539,6 @@ ingen_instantiate(const LV2_Descriptor* descriptor,
plugin->map = map;
plugin->world = new Ingen::World(
plugin->argc, plugin->argv, map, unmap, log);
- if (!plugin->world->load_module("serialisation")) {
- delete plugin->world;
- return NULL;
- }
LV2_URID bufsz_max = map->map(map->handle, LV2_BUF_SIZE__maxBlockLength);
LV2_URID bufsz_seq = map->map(map->handle, LV2_BUF_SIZE__sequenceSize);