summaryrefslogtreecommitdiffstats
path: root/src/shared/LV2Atom.cpp
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2010-11-30 23:01:30 +0000
committerDavid Robillard <d@drobilla.net>2010-11-30 23:01:30 +0000
commit27c3aec25ca4eefa88df64b63d50ed4451bec190 (patch)
tree9ec17eeb9ad9080cca2f3a350afe31d696c68638 /src/shared/LV2Atom.cpp
parentd2f94aa4fd3472ff86fea5abe7a58d15a90d3264 (diff)
downloadingen-27c3aec25ca4eefa88df64b63d50ed4451bec190.tar.gz
ingen-27c3aec25ca4eefa88df64b63d50ed4451bec190.tar.bz2
ingen-27c3aec25ca4eefa88df64b63d50ed4451bec190.zip
Consistent naming for URI quarks.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2678 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/shared/LV2Atom.cpp')
-rw-r--r--src/shared/LV2Atom.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/shared/LV2Atom.cpp b/src/shared/LV2Atom.cpp
index ea6a4fa2..aa004f6f 100644
--- a/src/shared/LV2Atom.cpp
+++ b/src/shared/LV2Atom.cpp
@@ -34,16 +34,16 @@ namespace LV2Atom {
bool
to_atom(const Shared::LV2URIMap& uris, const LV2_Atom* object, Raul::Atom& atom)
{
- if (object->type == uris.object_class_string.id) {
+ if (object->type == uris.atom_String.id) {
atom = Raul::Atom((char*)(object + 1));
return true;
- } else if (object->type == uris.object_class_bool.id) {
+ } else if (object->type == uris.atom_Bool.id) {
atom = Raul::Atom((bool)(int32_t*)(object + 1));
return true;
- } else if (object->type == uris.object_class_int32.id) {
+ } else if (object->type == uris.atom_Int32.id) {
atom = Raul::Atom((int32_t*)(object + 1));
return true;
- } else if (object->type == uris.object_class_float32.id) {
+ } else if (object->type == uris.atom_Float32.id) {
atom = Raul::Atom((float*)(object + 1));
return true;
}
@@ -60,17 +60,17 @@ from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Atom* objec
char* str;
switch (atom.type()) {
case Raul::Atom::FLOAT:
- object->type = uris.object_class_float32.id;
+ object->type = uris.atom_Float32.id;
object->size = sizeof(float);
*(float*)(object + 1) = atom.get_float();
break;
case Raul::Atom::INT:
- object->type = uris.object_class_int32.id;
+ object->type = uris.atom_Int32.id;
object->size = sizeof(int32_t);
*(int32_t*)(object + 1) = atom.get_int32();
break;
case Raul::Atom::STRING:
- object->type = uris.object_class_string.id;
+ object->type = uris.atom_String.id;
object->size = std::min((uint16_t)object->size, (uint16_t)(strlen(atom.get_string()) + 1));
str = ((char*)(object + 1));
str[object->size - 1] = '\0';
@@ -78,7 +78,7 @@ from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Atom* objec
break;
case Raul::Atom::BLOB:
error << "TODO: Blob support" << endl;
- /*object->type = uris.object_class_string;
+ /*object->type = uris.atom_String;
*(uint16_t*)(object + 1) = uris.uri_to_id(NULL, atom.get_blob_type());
memcpy(((char*)(object + 1) + sizeof(uint32_t)), atom.get_blob(),
std::min(atom.data_size(), (size_t)object->size));*/