diff options
| author | David Robillard <d@drobilla.net> | 2011-04-19 16:18:03 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-04-19 16:18:03 +0000 |
| commit | d940d40081bae1e2e2e077b6ee08743465ae4f27 (patch) | |
| tree | 2e80587c7dc62d2b150bc0d7a8bf528b6b6c03f6 | |
| parent | 8ba6bb943889bfdd58cf4a971a152041c1199cfe (diff) | |
| download | ingen-d940d40081bae1e2e2e077b6ee08743465ae4f27.tar.gz ingen-d940d40081bae1e2e2e077b6ee08743465ae4f27.tar.bz2 ingen-d940d40081bae1e2e2e077b6ee08743465ae4f27.zip | |
Fix building with HTTP support (fixes #674).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3160 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/client/HTTPClientReceiver.cpp | 2 | ||||
| -rw-r--r-- | src/engine/HTTPEngineReceiver.cpp | 2 | ||||
| -rw-r--r-- | src/engine/ingen_http.cpp | 10 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/client/HTTPClientReceiver.cpp b/src/client/HTTPClientReceiver.cpp index d0c4fb73..d3d677ad 100644 --- a/src/client/HTTPClientReceiver.cpp +++ b/src/client/HTTPClientReceiver.cpp @@ -224,7 +224,7 @@ void HTTPClientReceiver::start(bool dump) { if (!_world->parser()) - _world->load("ingen_serialisation"); + _world->load_module("ingen_serialisation"); SoupMessage* msg = soup_message_new("GET", (_url + "/stream").c_str()); assert(SOUP_IS_MESSAGE(msg)); diff --git a/src/engine/HTTPEngineReceiver.cpp b/src/engine/HTTPEngineReceiver.cpp index 196a8ad6..22de974e 100644 --- a/src/engine/HTTPEngineReceiver.cpp +++ b/src/engine/HTTPEngineReceiver.cpp @@ -61,7 +61,7 @@ HTTPEngineReceiver::HTTPEngineReceiver(Engine& engine, uint16_t port) LOG(info) << "Started HTTP server on port " << soup_server_get_port(_server) << endl; if (!engine.world()->parser() || !engine.world()->serialiser()) - engine.world()->load("ingen_serialisation"); + engine.world()->load_module("ingen_serialisation"); Thread::set_name("HTTPEngineReceiver"); } diff --git a/src/engine/ingen_http.cpp b/src/engine/ingen_http.cpp index 9e41ff9c..c758e10b 100644 --- a/src/engine/ingen_http.cpp +++ b/src/engine/ingen_http.cpp @@ -26,10 +26,12 @@ using namespace Ingen; struct IngenHTTPModule : public Ingen::Shared::Module { void load(Ingen::Shared::World* world) { - SharedPtr<HTTPEngineReceiver> interface( - new Ingen::HTTPEngineReceiver(*world->local_engine().get(), - world->conf()->option("engine-port").get_int32())); - world->local_engine()->add_event_source(interface); + Engine::Engine* engine = (Engine::Engine*)world->local_engine().get(); + SharedPtr<Engine::HTTPEngineReceiver> interface( + new Engine::HTTPEngineReceiver( + *engine, + world->conf()->option("engine-port").get_int32())); + engine->add_event_source(interface); } }; |