diff options
| author | David Robillard <d@drobilla.net> | 2008-11-16 02:49:22 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-11-16 02:49:22 +0000 |
| commit | 24d998447070dbfef3eaf7762dce7e97c3903801 (patch) | |
| tree | 0feffd6ca3c4459e0a7ff6fad9cf48b7816f2cd7 /src/ingen | |
| parent | fb6471ac9d5daefd3655bc19532a6028b5f0ead4 (diff) | |
| download | ingen-24d998447070dbfef3eaf7762dce7e97c3903801.tar.gz ingen-24d998447070dbfef3eaf7762dce7e97c3903801.tar.bz2 ingen-24d998447070dbfef3eaf7762dce7e97c3903801.zip | |
TCP notification stream support (not fully implemented yet, but transport stuff is working).
Support multiple event sources in the engine.
Clean up HTTP/TCP stuff.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1721 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/ingen')
| -rw-r--r-- | src/ingen/main.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 8d155c5c..4c73f1de 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -137,7 +137,7 @@ main(int argc, char** argv) Ingen::QueuedEngineInterface* (*new_interface)(Ingen::Engine& engine); if (engine_osc_module->get_symbol("new_queued_interface", (void*&)new_interface)) { SharedPtr<QueuedEngineInterface> interface(new_interface(*engine)); - world->local_engine->set_event_source(interface); + world->local_engine->add_event_source(interface); engine_interface = interface; world->engine = engine_interface; } @@ -149,7 +149,7 @@ main(int argc, char** argv) if (engine_osc_module->get_symbol("new_osc_receiver", (void*&)new_receiver)) { SharedPtr<EventSource> source(new_receiver(*engine, pre_processor_queue_size, args.engine_port_arg)); - world->local_engine->set_event_source(source); + world->local_engine->add_event_source(source); } } #endif @@ -158,8 +158,9 @@ main(int argc, char** argv) // FIXE: leak Ingen::HTTPEngineReceiver* (*new_receiver)(Ingen::Engine& engine, uint16_t port); if (engine_http_module->get_symbol("new_http_receiver", (void*&)new_receiver)) { - HTTPEngineReceiver* receiver = new_receiver( - *world->local_engine, args.engine_port_arg); + boost::shared_ptr<HTTPEngineReceiver> receiver(new_receiver( + *world->local_engine, args.engine_port_arg)); + world->local_engine->add_event_source(receiver); receiver->activate(); } } |