aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine/machina
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-14 07:39:55 +0000
committerDavid Robillard <d@drobilla.net>2013-01-14 07:39:55 +0000
commit0a02e807beea6104248cb6cf00ef6689c9231912 (patch)
treecb279fb1a1b801c48fa83a59fb56dde486b6dbfd /src/engine/machina
parent035a94ce6c9a32025f88441ef8aedaf887a40318 (diff)
downloadmachina-0a02e807beea6104248cb6cf00ef6689c9231912.tar.gz
machina-0a02e807beea6104248cb6cf00ef6689c9231912.tar.bz2
machina-0a02e807beea6104248cb6cf00ef6689c9231912.zip
Fix saving and loading machines.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4984 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/machina')
-rw-r--r--src/engine/machina/Loader.hpp5
-rw-r--r--src/engine/machina/URIs.hpp17
2 files changed, 22 insertions, 0 deletions
diff --git a/src/engine/machina/Loader.hpp b/src/engine/machina/Loader.hpp
index 99f1577..548e23a 100644
--- a/src/engine/machina/Loader.hpp
+++ b/src/engine/machina/Loader.hpp
@@ -21,6 +21,7 @@
#include "machina/types.hpp"
#include "raul/Atom.hpp"
+#include "raul/TimeStamp.hpp"
#include "sord/sordmm.hpp"
using Sord::Namespaces;
@@ -36,6 +37,10 @@ public:
SPtr<Machine> load(const Glib::ustring& filename);
+ SPtr<Machine> load_midi(const Glib::ustring& filename,
+ double q,
+ Raul::TimeDuration dur);
+
private:
Raul::Forge& _forge;
Sord::World& _rdf_world;
diff --git a/src/engine/machina/URIs.hpp b/src/engine/machina/URIs.hpp
index 105291a..eba1692 100644
--- a/src/engine/machina/URIs.hpp
+++ b/src/engine/machina/URIs.hpp
@@ -23,6 +23,23 @@
#include "machina/types.hpp"
+#define MACHINA_URI_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+
+#define MACHINA_NS "http://drobilla.net/ns/machina#"
+
+#define MACHINA_NS_Machine MACHINA_NS "Machine"
+#define MACHINA_NS_Node MACHINA_NS "Node"
+#define MACHINA_NS_SelectorNode MACHINA_NS "SelectorNode"
+#define MACHINA_NS_arc MACHINA_NS "arc"
+#define MACHINA_NS_duration MACHINA_NS "duration"
+#define MACHINA_NS_head MACHINA_NS "head"
+#define MACHINA_NS_node MACHINA_NS "node"
+#define MACHINA_NS_onEnter MACHINA_NS "onEnter"
+#define MACHINA_NS_onExit MACHINA_NS "onExit"
+#define MACHINA_NS_probability MACHINA_NS "probability"
+#define MACHINA_NS_start MACHINA_NS "start"
+#define MACHINA_NS_tail MACHINA_NS "tail"
+
namespace machina {
class URIs