diff options
| author | David Robillard <d@drobilla.net> | 2013-02-23 19:55:13 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-02-23 19:55:13 +0000 |
| commit | 6b6cb56b2ceab509569bfca247f108f2be5e25c0 (patch) | |
| tree | 5a46eee0c3f518fa7bb20e6a8784e5bd3ba04598 /src/serialisation | |
| parent | 5a6aafff8dda9dddce479a2ad86edb933c9688c3 (diff) | |
| download | ingen-6b6cb56b2ceab509569bfca247f108f2be5e25c0.tar.gz ingen-6b6cb56b2ceab509569bfca247f108f2be5e25c0.tar.bz2 ingen-6b6cb56b2ceab509569bfca247f108f2be5e25c0.zip | |
Move Atom implementation out of Raul so it can depend on LV2.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@5076 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/serialisation')
| -rw-r--r-- | src/serialisation/Parser.cpp | 4 | ||||
| -rw-r--r-- | src/serialisation/Serialiser.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/serialisation/Parser.cpp b/src/serialisation/Parser.cpp index 427b0f02..adc3f208 100644 --- a/src/serialisation/Parser.cpp +++ b/src/serialisation/Parser.cpp @@ -24,6 +24,7 @@ #include <glibmm/miscutils.h> #include <glibmm/ustring.h> +#include "ingen/Atom.hpp" #include "ingen/Interface.hpp" #include "ingen/Log.hpp" #include "ingen/URIMap.hpp" @@ -31,7 +32,6 @@ #include "ingen/World.hpp" #include "ingen/serialisation/Parser.hpp" #include "lv2/lv2plug.in/ns/ext/atom/atom.h" -#include "raul/Atom.hpp" #include "serd/serd.h" #include "sord/sordmm.hpp" #include "sratom/sratom.h" @@ -113,7 +113,7 @@ get_properties(Ingen::World* world, sratom_read(sratom, &forge, world->rdf_world()->c_obj(), model.c_obj(), i.get_object().c_obj()); const LV2_Atom* atom = (const LV2_Atom*)out.buf; - Raul::Atom atomm; + Atom atomm; // FIXME: Don't bloat out all URIs if (atom->type == forge.URID) { atomm = world->forge().alloc_uri( diff --git a/src/serialisation/Serialiser.cpp b/src/serialisation/Serialiser.cpp index d0052b81..db4d8430 100644 --- a/src/serialisation/Serialiser.cpp +++ b/src/serialisation/Serialiser.cpp @@ -472,7 +472,7 @@ Serialiser::Impl::serialise_port(const Node* port, port->has_property(uris.rdf_type, uris.lv2_ControlPort) && port->has_property(uris.rdf_type, uris.lv2_InputPort)) { - const Raul::Atom& val = port->get_property(uris.ingen_value); + const Atom& val = port->get_property(uris.ingen_value); if (val.is_valid()) { props.insert(make_pair(uris.lv2_default, val)); } else { |