diff options
| author | David Robillard <d@drobilla.net> | 2013-01-13 07:49:49 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-13 07:49:49 +0000 |
| commit | 67a8adbc93991acfb688f378f52392995a272fac (patch) | |
| tree | a4e629bd9c0d7da4cc5c7cb644b3352ca6f0dc78 /src/engine/Loader.cpp | |
| parent | 33aa54fa98783d1da2a322ee136c17df7f9c98a5 (diff) | |
| download | machina-67a8adbc93991acfb688f378f52392995a272fac.tar.gz machina-67a8adbc93991acfb688f378f52392995a272fac.tar.bz2 machina-67a8adbc93991acfb688f378f52392995a272fac.zip | |
Change model to have a single initial node.
Merge multiple recording into branches off the same initial node.
Make transport state sane with 3 distinct states.
Handle announcing objects several times correctly.
Don't send useless zero coordinates for new nodes, position in visible area.
Rewrite and clean up Machine code.
Update help.
git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4954 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/engine/Loader.cpp')
| -rw-r--r-- | src/engine/Loader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/Loader.cpp b/src/engine/Loader.cpp index 0ee5ba7..3c05401 100644 --- a/src/engine/Loader.cpp +++ b/src/engine/Loader.cpp @@ -82,7 +82,7 @@ Loader::load(const Glib::ustring& uri) Sord::Node nil; Sord::URI rdf_type(_rdf_world, NS_RDF "type"); - Sord::URI machina_SelectorNode(_rdf_world, NS_MACHINA "initialNode"); + Sord::URI machina_SelectorNode(_rdf_world, NS_MACHINA "SelectorNode"); Sord::URI machina_node(_rdf_world, NS_MACHINA "node"); Sord::URI machina_initialNode(_rdf_world, NS_MACHINA "initialNode"); Sord::URI machina_duration(_rdf_world, NS_MACHINA "duration"); @@ -192,7 +192,7 @@ Loader::load(const Glib::ustring& uri) } - if (machine && machine->nodes().size() > 0) { + if (machine && !machine->nodes().empty()) { machine->reset(NULL, machine->time()); return machine; } else { |