diff options
| author | David Robillard <d@drobilla.net> | 2012-05-12 07:04:11 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-05-12 07:04:11 +0000 |
| commit | 52011c3b045d9f49a4bc25c9f545bb35e5c2a0a9 (patch) | |
| tree | 29012d7da9bf9e0525574b3d8713eaf828626ac5 /src/server/Engine.cpp | |
| parent | 2e8a9b483a8d2ca7ba2a4feb4a845a32ab1eebeb (diff) | |
| download | ingen-52011c3b045d9f49a4bc25c9f545bb35e5c2a0a9.tar.gz ingen-52011c3b045d9f49a4bc25c9f545bb35e5c2a0a9.tar.bz2 ingen-52011c3b045d9f49a4bc25c9f545bb35e5c2a0a9.zip | |
More work towards checking contexts via parameter rather than thread magic.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4376 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/Engine.cpp')
| -rw-r--r-- | src/server/Engine.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/Engine.cpp b/src/server/Engine.cpp index edd0b4a4..f1c714d3 100644 --- a/src/server/Engine.cpp +++ b/src/server/Engine.cpp @@ -57,12 +57,12 @@ Engine::Engine(Ingen::Shared::World* a_world) , _broadcaster(new ClientBroadcaster()) , _control_bindings(NULL) , _maid(new Raul::Maid(event_queue_size())) - , _message_context(new MessageContext(*this)) , _node_factory(new NodeFactory(a_world)) , _pre_processor(new PreProcessor()) , _post_processor(new PostProcessor(*this)) , _event_writer(new EventWriter(*this)) , _root_patch(NULL) + , _message_context(*this) , _process_context(*this) , _quit_flag(false) { @@ -93,7 +93,6 @@ Engine::~Engine() delete _pre_processor; delete _post_processor; delete _node_factory; - delete _message_context; delete _control_bindings; delete _broadcaster; delete _event_writer; @@ -150,7 +149,7 @@ Engine::activate() _buffer_factory->set_block_length(_driver->block_length()); - _message_context->Thread::start(); + _message_context.Thread::start(); const Ingen::Shared::URIs& uris = world()->uris(); Shared::Forge& forge = world()->forge(); @@ -255,8 +254,8 @@ Engine::run(uint32_t sample_count) _process_context, _root_patch->port_impl(1)->buffer(0).get()); // Signal message context to run if necessary - if (message_context()->has_requests()) { - message_context()->signal(_process_context); + if (_message_context.has_requests()) { + _message_context.signal(_process_context); } } |