summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/engine/Engine.cpp20
-rw-r--r--src/engine/Engine.hpp16
2 files changed, 17 insertions, 19 deletions
diff --git a/src/engine/Engine.cpp b/src/engine/Engine.cpp
index 163ac0a9..8585b5a3 100644
--- a/src/engine/Engine.cpp
+++ b/src/engine/Engine.cpp
@@ -57,15 +57,14 @@ using namespace Shared;
bool ThreadManager::single_threaded = true;
Engine::Engine(Ingen::Shared::World* a_world)
- : _world(a_world)
- , _maid(new Raul::Maid(maid_queue_size))
- , _post_processor(new PostProcessor(*this, post_processor_queue_size))
- , _broadcaster(new ClientBroadcaster())
- , _node_factory(new NodeFactory(a_world))
- , _message_context(new MessageContext(*this))
+ : _broadcaster(new ClientBroadcaster())
, _buffer_factory(new BufferFactory(*this, a_world->uris()))
, _control_bindings(new ControlBindings(*this))
- , _quit_flag(false)
+ , _maid(new Raul::Maid(maid_queue_size))
+ , _message_context(new MessageContext(*this))
+ , _node_factory(new NodeFactory(a_world))
+ , _post_processor(new PostProcessor(*this, post_processor_queue_size))
+ , _world(a_world)
{
if (a_world->store()) {
assert(PtrCast<EngineStore>(a_world->store()));
@@ -84,11 +83,10 @@ Engine::~Engine()
if ( ! PtrCast<GraphObjectImpl>(i->second)->parent() )
i->second.reset();
- delete _broadcaster;
- delete _node_factory;
- delete _post_processor;
-
delete _maid;
+ delete _post_processor;
+ delete _node_factory;
+ delete _broadcaster;
munlockall();
}
diff --git a/src/engine/Engine.hpp b/src/engine/Engine.hpp
index ebebc8c6..e1854a8b 100644
--- a/src/engine/Engine.hpp
+++ b/src/engine/Engine.hpp
@@ -95,14 +95,14 @@ public:
*/
virtual void process_events(ProcessContext& context);
- virtual BufferFactory* buffer_factory() const { return _buffer_factory; }
virtual ClientBroadcaster* broadcaster() const { return _broadcaster; }
+ virtual BufferFactory* buffer_factory() const { return _buffer_factory; }
virtual ControlBindings* control_bindings() const { return _control_bindings; }
virtual Driver* driver() const { return _driver.get(); }
+ virtual Raul::Maid* maid() const { return _maid; }
virtual MessageContext* message_context() const { return _message_context; }
virtual NodeFactory* node_factory() const { return _node_factory; }
virtual PostProcessor* post_processor() const { return _post_processor; }
- virtual Raul::Maid* maid() const { return _maid; }
virtual Shared::World* world() const { return _world; }
virtual SharedPtr<EngineStore> engine_store() const;
@@ -111,15 +111,15 @@ private:
typedef std::set< SharedPtr<EventSource> > EventSources;
EventSources _event_sources;
- Ingen::Shared::World* _world;
- SharedPtr<Driver> _driver;
- Raul::Maid* _maid;
- PostProcessor* _post_processor;
ClientBroadcaster* _broadcaster;
- NodeFactory* _node_factory;
- MessageContext* _message_context;
BufferFactory* _buffer_factory;
ControlBindings* _control_bindings;
+ SharedPtr<Driver> _driver;
+ Raul::Maid* _maid;
+ MessageContext* _message_context;
+ NodeFactory* _node_factory;
+ PostProcessor* _post_processor;
+ Shared::World* _world;
bool _quit_flag;
};