diff options
| author | David Robillard <d@drobilla.net> | 2010-12-17 04:22:00 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2010-12-17 04:22:00 +0000 |
| commit | 9d10e002f998f560bcaba2aadbc858539f01e6a5 (patch) | |
| tree | fe420f9e06033bcde68c312ce1b4912a5f01a046 | |
| parent | dcc94e12b12d000acbe64e938255c85291d27639 (diff) | |
| download | machina-9d10e002f998f560bcaba2aadbc858539f01e6a5.tar.gz machina-9d10e002f998f560bcaba2aadbc858539f01e6a5.tar.bz2 machina-9d10e002f998f560bcaba2aadbc858539f01e6a5.zip | |
Fix serialisation (fix ticket #508).
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@2735 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/engine/Action.cpp | 2 | ||||
| -rw-r--r-- | src/engine/Edge.cpp | 2 | ||||
| -rw-r--r-- | src/engine/Loader.cpp | 4 | ||||
| -rw-r--r-- | src/engine/Node.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/Action.cpp b/src/engine/Action.cpp index 1f31bbe..e11810c 100644 --- a/src/engine/Action.cpp +++ b/src/engine/Action.cpp @@ -26,7 +26,7 @@ Action::write_state(Redland::Model& model) { using namespace Raul; - if (!_id) + if (!_id.is_valid()) set_id(model.world().blank_id()); model.add_statement(_id, diff --git a/src/engine/Edge.cpp b/src/engine/Edge.cpp index 87d708f..6bef290 100644 --- a/src/engine/Edge.cpp +++ b/src/engine/Edge.cpp @@ -30,7 +30,7 @@ Edge::write_state(Redland::Model& model) { using namespace Raul; - if (!_id) + if (!_id.is_valid()) set_id(model.world().blank_id()); model.add_statement(_id, diff --git a/src/engine/Loader.cpp b/src/engine/Loader.cpp index fa05fd0..a899fce 100644 --- a/src/engine/Loader.cpp +++ b/src/engine/Loader.cpp @@ -71,9 +71,9 @@ Loader::load(const Glib::ustring& uri) } } - const string machine_uri = string("<") + document_uri + ">"; + const string machine_uri = string("<>"); - cout << "[Loader] Loading " << machine_uri << " from " << document_uri << endl; + cout << "[Loader] Loading " << document_uri << endl; machine = SharedPtr<Machine>(new Machine(TimeUnit::beats(MACHINA_PPQN))); diff --git a/src/engine/Node.cpp b/src/engine/Node.cpp index c5a9192..3f61121 100644 --- a/src/engine/Node.cpp +++ b/src/engine/Node.cpp @@ -209,7 +209,7 @@ Node::write_state(Redland::Model& model) { using namespace Raul; - if (!_id) + if (!_id.is_valid()) set_id(model.world().blank_id()); if (_is_selector) |