diff options
author | David Robillard <d@drobilla.net> | 2014-12-18 07:53:39 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-12-18 07:53:39 +0000 |
commit | 0f5a2bafb9f1c3f64256e1899857b2f5cb3d8982 (patch) | |
tree | f826e3cda65db9990aa9d1b805d634f0e3ce23d5 /src/engine/machina/Controller.hpp | |
parent | 452f0c9a8e020831eedb0dcb8b78b8ca9435b502 (diff) | |
download | machina-0f5a2bafb9f1c3f64256e1899857b2f5cb3d8982.tar.gz machina-0f5a2bafb9f1c3f64256e1899857b2f5cb3d8982.tar.bz2 machina-0f5a2bafb9f1c3f64256e1899857b2f5cb3d8982.zip |
Work towards engine/GUI separation.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@5495 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/machina/Controller.hpp')
-rw-r--r-- | src/engine/machina/Controller.hpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/engine/machina/Controller.hpp b/src/engine/machina/Controller.hpp index e745c9c..833b5b2 100644 --- a/src/engine/machina/Controller.hpp +++ b/src/engine/machina/Controller.hpp @@ -1,6 +1,6 @@ /* This file is part of Machina. - Copyright 2007-2013 David Robillard <http://drobilla.net> + Copyright 2007-2014 David Robillard <http://drobilla.net> Machina is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -24,8 +24,9 @@ #include "raul/RingBuffer.hpp" #include "raul/Maid.hpp" -#include "machina/types.hpp" +#include "machina/Model.hpp" #include "machina/URIs.hpp" +#include "machina/types.hpp" #include "Stateful.hpp" @@ -37,19 +38,13 @@ namespace machina { class Engine; class Machine; -class Stateful; - -namespace client { -class ClientModel; -class ClientObject; -} class Controller { public: - Controller(SPtr<Engine> engine, client::ClientModel& client_model); + Controller(SPtr<Engine> engine, Model& model); - uint64_t create(const client::ClientObject& obj); + uint64_t create(const Properties& properties); uint64_t connect(uint64_t tail_id, uint64_t head_id); void set_property(uint64_t object_id, URIInt key, const Atom& value); @@ -74,8 +69,8 @@ private: typedef std::set<SPtr<Stateful>, StatefulComparator> Objects; Objects _objects; - SPtr<Engine> _engine; - client::ClientModel& _client_model; + SPtr<Engine> _engine; + Model& _model; SPtr<Raul::RingBuffer> _updates; }; |