Work towards engine/GUI separation.

git-svn-id: http://svn.drobilla.net/lad/trunk/machina@5495 a436a847-0d15-0410-975c-d299462d15a1

3 files changed, 56 insertions, 13 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;
 };
diff --git a/src/engine/machina/Model.hpp b/src/engine/machina/Model.hpp
new file mode 100644
index 0000000..32a332e
--- /dev/null
+++ b/src/engine/machina/Model.hpp
@@ -0,0 +1,44 @@
+/*
+  This file is part of Machina.
+  Copyright 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
+  Foundation, either version 3 of the License, or any later version.
+
+  Machina is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with Machina.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef MACHINA_MODEL_HPP
+#define MACHINA_MODEL_HPP
+
+#include <stdint.h>
+
+#include <map>
+
+#include "machina/Atom.hpp"
+#include "machina/types.hpp"
+
+namespace machina {
+
+class Model
+{
+public:
+	virtual ~Model() {}
+
+	virtual void new_object(uint64_t id, const Properties& properties) = 0;
+
+	virtual void erase_object(uint64_t id) = 0;
+
+	virtual void        set(uint64_t id, URIInt key, const Atom& value) = 0;
+	virtual const Atom& get(uint64_t id, URIInt key) const = 0;
+};
+
+}  // namespace machina
+
+#endif  // MACHINA_MODEL_HPP
diff --git a/src/engine/machina/types.hpp b/src/engine/machina/types.hpp
index fff2601..e9ac7d0 100644
--- a/src/engine/machina/types.hpp
+++ b/src/engine/machina/types.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
@@ -17,6 +17,7 @@
 #ifndef MACHINA_TYPES_HPP
 #define MACHINA_TYPES_HPP
 
+#include <map>
 #include <memory>
 
 #include "raul/RingBuffer.hpp"
@@ -27,6 +28,9 @@ typedef unsigned char byte;
 
 typedef uint32_t URIInt;
 
+class Atom;
+typedef std::map<URIInt, Atom> Properties;
+
 #if __cplusplus >= 201103L
 template <class T>
 using SPtr = std::shared_ptr<T>;