summaryrefslogtreecommitdiffstats
path: root/src/server/ingen_engine.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2012-05-09 01:14:30 +0000
committerDavid Robillard <d@drobilla.net>2012-05-09 01:14:30 +0000
commitbaeb3c1872a989b69eb89fae04f93c59b06f258e (patch)
tree83720f9c7bad7ab26c910180d8caea2fd4cb7e70 /src/server/ingen_engine.cpp
parent4d46a232b30be99bc34e581cbc636345f77c6bc4 (diff)
downloadingen-baeb3c1872a989b69eb89fae04f93c59b06f258e.tar.gz
ingen-baeb3c1872a989b69eb89fae04f93c59b06f258e.tar.bz2
ingen-baeb3c1872a989b69eb89fae04f93c59b06f258e.zip
Simply event interface design and make only one pre-process thread.
This makes event pre-processing actually safe for multiple interfaces since multiple events will never be pre-processed simultaneously and the pre-process order is definitely the same as the execute order. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4323 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/ingen_engine.cpp')
-rw-r--r--src/server/ingen_engine.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/server/ingen_engine.cpp b/src/server/ingen_engine.cpp
index 28659ec6..917e83cf 100644
--- a/src/server/ingen_engine.cpp
+++ b/src/server/ingen_engine.cpp
@@ -18,7 +18,6 @@
#include "ingen/shared/World.hpp"
#include "Engine.hpp"
#include "EventWriter.hpp"
-#include "EventQueue.hpp"
#include "util.hpp"
using namespace Ingen;
@@ -28,11 +27,9 @@ struct IngenEngineModule : public Ingen::Shared::Module {
Server::set_denormal_flags();
SharedPtr<Server::Engine> engine(new Server::Engine(world));
world->set_local_engine(engine);
- SharedPtr<Server::EventQueue> queue(new Server::EventQueue());
- SharedPtr<Server::EventWriter> interface(
- new Server::EventWriter(*engine.get(), *queue.get()));
- world->set_engine(interface);
- engine->add_event_source(queue);
+ if (!world->engine()) {
+ world->set_engine(SharedPtr<Interface>(engine->interface(), NullDeleter<Interface>));
+ }
assert(world->local_engine() == engine);
}
};