diff options
| author | David Robillard <d@drobilla.net> | 2009-12-19 21:37:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-12-19 21:37:50 +0000 |
| commit | 19045ab92aa7e996971584a0dc8780d1d58b498b (patch) | |
| tree | 619c73deb7fd64ce31c5167490d1ae186dbb2695 /src/engine/HTTPEngineReceiver.cpp | |
| parent | 4613a2e15f1122ecf6830171de0ab18dc22fefff (diff) | |
| download | ingen-19045ab92aa7e996971584a0dc8780d1d58b498b.tar.gz ingen-19045ab92aa7e996971584a0dc8780d1d58b498b.tar.bz2 ingen-19045ab92aa7e996971584a0dc8780d1d58b498b.zip | |
New ingen module (library, not e.g. LV2 plugin) design.
Much cleaner interface and general usage of Ingen as a library.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2314 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/HTTPEngineReceiver.cpp')
| -rw-r--r-- | src/engine/HTTPEngineReceiver.cpp | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp index 532a4371..ecb8d018 100644 --- a/src/engine/HTTPEngineReceiver.cpp +++ b/src/engine/HTTPEngineReceiver.cpp @@ -25,7 +25,6 @@ #include "interface/ClientInterface.hpp" #include "module/Module.hpp" #include "serialisation/Parser.hpp" -#include "serialisation/serialisation.hpp" #include "serialisation/Serialiser.hpp" #include "ClientBroadcaster.hpp" #include "Engine.hpp" @@ -55,20 +54,8 @@ HTTPEngineReceiver::HTTPEngineReceiver(Engine& engine, uint16_t port) cout << "Started HTTP server on port " << soup_server_get_port(_server) << endl; Thread::set_name("HTTP Receiver"); - if (!engine.world()->serialisation_module) - engine.world()->serialisation_module = Ingen::Shared::load_module("ingen_serialisation"); - - if (engine.world()->serialisation_module) { - if (!engine.world()->serialiser) - engine.world()->serialiser = SharedPtr<Serialiser>( - Ingen::Serialisation::new_serialiser(engine.world(), engine.engine_store())); - - if (!engine.world()->parser) - engine.world()->parser = SharedPtr<Parser>( - Ingen::Serialisation::new_parser()); - } else { - cerr << "WARNING: Failed to load ingen_serialisation module, HTTP disabled." << endl; - } + if (!engine.world()->parser || !engine.world()->serialiser) + engine.world()->load("ingen_serialisation"); Thread::set_name("HTTP Receiver"); } @@ -242,14 +229,3 @@ HTTPEngineReceiver::ReceiveThread::_run() } // namespace Ingen - -extern "C" { - -Ingen::HTTPEngineReceiver* -new_http_receiver(Ingen::Engine& engine, uint16_t port) -{ - return new Ingen::HTTPEngineReceiver(engine, port); -} - -} // extern "C" - |