summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/client/PluginUI.cpp4
l---------src/common/object.lv21
-rw-r--r--src/engine/AudioBuffer.cpp18
-rw-r--r--src/engine/AudioBuffer.hpp8
-rw-r--r--src/engine/BufferFactory.cpp12
-rw-r--r--src/engine/ConnectionImpl.cpp16
-rw-r--r--src/engine/ConnectionImpl.hpp4
-rw-r--r--src/engine/EventBuffer.cpp6
-rw-r--r--src/engine/EventBuffer.hpp4
-rw-r--r--src/engine/LV2Info.cpp6
-rw-r--r--src/engine/LV2Info.hpp2
-rw-r--r--src/engine/LV2Node.cpp2
-rw-r--r--src/engine/MessageContext.hpp2
-rw-r--r--src/engine/ObjectBuffer.cpp24
-rw-r--r--src/engine/ObjectBuffer.hpp8
-rw-r--r--src/engine/PortImpl.cpp2
-rw-r--r--src/engine/events/RequestMetadata.cpp2
-rw-r--r--src/engine/events/SetPortValue.cpp8
-rw-r--r--src/shared/LV2Object.cpp6
-rw-r--r--src/shared/LV2Object.hpp6
-rw-r--r--src/shared/LV2URIMap.cpp14
21 files changed, 77 insertions, 78 deletions
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index 097ba1b0..42e864b1 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -17,7 +17,7 @@
#include "raul/log.hpp"
#include "event.lv2/event-helpers.h"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
#include "shared/LV2Features.hpp"
#include "shared/LV2URIMap.hpp"
#include "shared/LV2Object.hpp"
@@ -85,7 +85,7 @@ lv2_ui_write(LV2UI_Controller controller,
}
} else if (format == uris.object_transfer.id) {
- LV2_Object* buf = (LV2_Object*)buffer;
+ LV2_Atom* buf = (LV2_Atom*)buffer;
Raul::Atom val;
Shared::LV2Object::to_atom(uris, buf, val);
ui->world()->engine()->set_property(port->path(), uris.ingen_value, val);
diff --git a/src/common/object.lv2 b/src/common/object.lv2
deleted file mode 120000
index 08017748..00000000
--- a/src/common/object.lv2
+++ /dev/null
@@ -1 +0,0 @@
-../../../lv2/dev/object.lv2 \ No newline at end of file
diff --git a/src/engine/AudioBuffer.cpp b/src/engine/AudioBuffer.cpp
index e29fa5c4..2fc39818 100644
--- a/src/engine/AudioBuffer.cpp
+++ b/src/engine/AudioBuffer.cpp
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include "raul/log.hpp"
#include "raul/SharedPtr.hpp"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
#include "ingen-config.h"
#include "AudioBuffer.hpp"
#include "ProcessContext.hpp"
@@ -42,29 +42,29 @@ AudioBuffer::AudioBuffer(BufferFactory& bufs, Shared::PortType type, size_t size
, _set_value(0)
, _set_time(0)
{
- assert(size >= sizeof(LV2_Object) + sizeof(Sample));
+ assert(size >= sizeof(LV2_Atom) + sizeof(Sample));
assert(this->size() >= size);
assert(data());
_type = type;
// Control port / Single float object
if (type == PortType::CONTROL) {
- object()->type = 0;//map->float_type;
+ atom()->type = 0;//map->float_type;
// Audio port / Vector of float
} else {
assert(type == PortType::AUDIO);
- object()->type = 0;//map->vector_type;
- LV2_Vector_Body* body = (LV2_Vector_Body*)object()->body;
+ atom()->type = 0;//map->vector_type;
+ LV2_Vector_Body* body = (LV2_Vector_Body*)atom()->body;
body->elem_count = size / sizeof(Sample);
body->elem_type = 0;//map->float_type;
}
/*debug << "Created Audio Buffer" << endl
- << "\tobject @ " << (void*)object() << endl
- << "\tbody @ " << (void*)object()->body
- << "\t(offset " << (char*)object()->body - (char*)object() << ")" << endl
+ << "\tobject @ " << (void*)atom() << endl
+ << "\tbody @ " << (void*)atom()->body
+ << "\t(offset " << (char*)atom()->body - (char*)atom() << ")" << endl
<< "\tdata @ " << (void*)data()
- << "\t(offset " << (char*)data() - (char*)object() << ")"
+ << "\t(offset " << (char*)data() - (char*)atom() << ")"
<< endl;*/
clear();
diff --git a/src/engine/AudioBuffer.hpp b/src/engine/AudioBuffer.hpp
index 7edfdef3..bf6cb148 100644
--- a/src/engine/AudioBuffer.hpp
+++ b/src/engine/AudioBuffer.hpp
@@ -47,14 +47,14 @@ public:
inline Sample* data() const {
return (is_control())
- ? (Sample*)object()->body
- : (Sample*)(object()->body + sizeof(LV2_Vector_Body));
+ ? (Sample*)atom()->body
+ : (Sample*)(atom()->body + sizeof(LV2_Vector_Body));
}
inline SampleCount nframes() const {
return (is_control())
? 1
- : (_size - sizeof(LV2_Object) - sizeof(LV2_Vector_Body)) / sizeof(Sample);
+ : (_size - sizeof(LV2_Atom) - sizeof(LV2_Vector_Body)) / sizeof(Sample);
}
inline Sample& value_at(size_t offset) const
@@ -68,7 +68,7 @@ public:
private:
enum State { OK, HALF_SET_CYCLE_1, HALF_SET_CYCLE_2 };
- LV2_Vector_Body* vector() { return(LV2_Vector_Body*)object()->body; }
+ LV2_Vector_Body* vector() { return(LV2_Vector_Body*)atom()->body; }
State _state; ///< State of buffer for setting values next cycle
Sample _set_value; ///< Value set by set_value (for completing the set next cycle)
diff --git a/src/engine/BufferFactory.cpp b/src/engine/BufferFactory.cpp
index 318a1422..36f5bf0a 100644
--- a/src/engine/BufferFactory.cpp
+++ b/src/engine/BufferFactory.cpp
@@ -70,7 +70,7 @@ BufferFactory::set_block_length(SampleCount block_length)
size_t
BufferFactory::audio_buffer_size(SampleCount nframes)
{
- return sizeof(LV2_Object) + sizeof(LV2_Vector_Body) + (nframes * sizeof(float));
+ return sizeof(LV2_Atom) + sizeof(LV2_Vector_Body) + (nframes * sizeof(float));
}
@@ -81,7 +81,7 @@ BufferFactory::default_buffer_size(PortType type)
case PortType::AUDIO:
return audio_buffer_size(_engine.driver()->block_length());
case PortType::CONTROL:
- return sizeof(LV2_Object) + sizeof(float);
+ return sizeof(LV2_Atom) + sizeof(float);
case PortType::EVENTS:
return _engine.driver()->block_length() * event_bytes_per_frame;
default:
@@ -133,17 +133,17 @@ BufferFactory::create(Shared::PortType type, size_t size)
if (type.is_control()) {
AudioBuffer* ret = new AudioBuffer(*this, type, size);
- ret->object()->type = _uris->object_class_vector.id;
- ((LV2_Vector_Body*)ret->object()->body)->elem_type = _uris->object_class_float32.id;
+ ret->atom()->type = _uris->object_class_vector.id;
+ ((LV2_Vector_Body*)ret->atom()->body)->elem_type = _uris->object_class_float32.id;
buffer = ret;
} else if (type.is_audio()) {
AudioBuffer* ret = new AudioBuffer(*this, type, size);
- ret->object()->type = _uris->object_class_float32.id;
+ ret->atom()->type = _uris->object_class_float32.id;
buffer = ret;
} else if (type.is_events()) {
buffer = new EventBuffer(*this, size);
} else if (type.is_value() || type.is_message()) {
- buffer = new ObjectBuffer(*this, std::max(size, sizeof(LV2_Object) + sizeof(void*)));
+ buffer = new ObjectBuffer(*this, std::max(size, sizeof(LV2_Atom) + sizeof(void*)));
} else {
error << "Failed to create buffer of unknown type" << endl;
return Ref();
diff --git a/src/engine/ConnectionImpl.cpp b/src/engine/ConnectionImpl.cpp
index 495a97c2..942711c2 100644
--- a/src/engine/ConnectionImpl.cpp
+++ b/src/engine/ConnectionImpl.cpp
@@ -56,7 +56,7 @@ ConnectionImpl::ConnectionImpl(BufferFactory& bufs, PortImpl* src_port, PortImpl
assert(src_port->path() != dst_port->path());
if (must_queue())
- _queue = new Raul::RingBuffer<LV2_Object>(src_port->buffer_size() * 2);
+ _queue = new Raul::RingBuffer<LV2_Atom>(src_port->buffer_size() * 2);
}
@@ -75,12 +75,12 @@ ConnectionImpl::get_sources(Context& context, uint32_t voice,
IntrusivePtr<Buffer>* srcs, uint32_t max_num_srcs, uint32_t& num_srcs)
{
if (must_queue() && _queue->read_space() > 0) {
- LV2_Object obj;
- _queue->peek(sizeof(LV2_Object), &obj);
+ LV2_Atom obj;
+ _queue->peek(sizeof(LV2_Atom), &obj);
IntrusivePtr<Buffer> buf = context.engine().buffer_factory()->get(
- dst_port()->buffer_type(), sizeof(LV2_Object) + obj.size);
+ dst_port()->buffer_type(), sizeof(LV2_Atom) + obj.size);
void* data = buf->port_data(PortType::MESSAGE, context.offset());
- _queue->full_read(sizeof(LV2_Object) + obj.size, (LV2_Object*)data);
+ _queue->full_read(sizeof(LV2_Atom) + obj.size, (LV2_Atom*)data);
srcs[num_srcs++] = buf;
} else if (must_mix()) {
// Mixing down voices: every src voice mixed into every dst voice
@@ -110,15 +110,15 @@ ConnectionImpl::queue(Context& context)
}
for (src_buf->rewind(); src_buf->is_valid(); src_buf->increment()) {
- LV2_Event* ev = src_buf->get_event();
- LV2_Object* obj = LV2_OBJECT_FROM_EVENT(ev);
+ LV2_Event* ev = src_buf->get_event();
+ LV2_Atom* obj = LV2_ATOM_FROM_EVENT(ev);
/*debug << _src_port->path() << " -> " << _dst_port->path()
<< " QUEUE OBJECT TYPE " << obj->type << ":";
for (size_t i = 0; i < obj->size; ++i)
debug << " " << std::hex << (int)obj->body[i];
debug << endl;*/
- _queue->write(sizeof(LV2_Object) + obj->size, obj);
+ _queue->write(sizeof(LV2_Atom) + obj->size, obj);
context.engine().message_context()->run(_dst_port, context.start() + ev->frames);
}
}
diff --git a/src/engine/ConnectionImpl.hpp b/src/engine/ConnectionImpl.hpp
index 000477e2..8324e2e1 100644
--- a/src/engine/ConnectionImpl.hpp
+++ b/src/engine/ConnectionImpl.hpp
@@ -25,7 +25,7 @@
#include "raul/IntrusivePtr.hpp"
#include "interface/PortType.hpp"
#include "interface/Connection.hpp"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
#include "PortImpl.hpp"
#include "PortImpl.hpp"
@@ -97,7 +97,7 @@ public:
protected:
void dump() const;
- Raul::RingBuffer<LV2_Object>* _queue;
+ Raul::RingBuffer<LV2_Atom>* _queue;
BufferFactory& _bufs;
PortImpl* const _src_port;
diff --git a/src/engine/EventBuffer.cpp b/src/engine/EventBuffer.cpp
index 6ec3f259..17ce6118 100644
--- a/src/engine/EventBuffer.cpp
+++ b/src/engine/EventBuffer.cpp
@@ -163,13 +163,13 @@ EventBuffer::get_event(uint32_t* frames,
/** Get the object currently pointed to, or NULL if invalid.
*/
-LV2_Object*
-EventBuffer::get_object() const
+LV2_Atom*
+EventBuffer::get_atom() const
{
if (lv2_event_is_valid(&_iter)) {
uint8_t* data;
LV2_Event* ev = lv2_event_get(&_iter, &data);
- return LV2_OBJECT_FROM_EVENT(ev);
+ return LV2_ATOM_FROM_EVENT(ev);
}
return NULL;
}
diff --git a/src/engine/EventBuffer.hpp b/src/engine/EventBuffer.hpp
index 6964d63c..db4636e4 100644
--- a/src/engine/EventBuffer.hpp
+++ b/src/engine/EventBuffer.hpp
@@ -20,7 +20,7 @@
#include "event.lv2/event.h"
#include "event.lv2/event-helpers.h"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
#include "interface/PortType.hpp"
#include "Buffer.hpp"
@@ -64,7 +64,7 @@ public:
uint16_t* size,
uint8_t** data) const;
- LV2_Object* get_object() const;
+ LV2_Atom* get_atom() const;
LV2_Event* get_event() const;
bool append(uint32_t frames,
diff --git a/src/engine/LV2Info.cpp b/src/engine/LV2Info.cpp
index 2e57e9a2..34582282 100644
--- a/src/engine/LV2Info.cpp
+++ b/src/engine/LV2Info.cpp
@@ -18,7 +18,7 @@
#define __STDC_LIMIT_MACROS 1
#include <cassert>
#include <stdint.h>
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
#include "LV2Info.hpp"
#include "module/World.hpp"
#include "LV2Features.hpp"
@@ -36,8 +36,8 @@ LV2Info::LV2Info(Ingen::Shared::World* world)
, control_class(slv2_value_new_uri(world->slv2_world(), SLV2_PORT_CLASS_CONTROL))
, audio_class(slv2_value_new_uri(world->slv2_world(), SLV2_PORT_CLASS_AUDIO))
, event_class(slv2_value_new_uri(world->slv2_world(), SLV2_PORT_CLASS_EVENT))
- , value_port_class(slv2_value_new_uri(world->slv2_world(), LV2_OBJECT_URI "#ValuePort"))
- , message_port_class(slv2_value_new_uri(world->slv2_world(), LV2_OBJECT_URI "#MessagePort"))
+ , value_port_class(slv2_value_new_uri(world->slv2_world(), LV2_ATOM_URI "#ValuePort"))
+ , message_port_class(slv2_value_new_uri(world->slv2_world(), LV2_ATOM_URI "#MessagePort"))
, _world(world)
{
assert(world);
diff --git a/src/engine/LV2Info.hpp b/src/engine/LV2Info.hpp
index 2ba0ef20..fecf8f18 100644
--- a/src/engine/LV2Info.hpp
+++ b/src/engine/LV2Info.hpp
@@ -31,7 +31,7 @@
#include "shared/LV2Features.hpp"
#include "uri-map.lv2/uri-map.h"
#include "event.lv2/event.h"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
#include "resize-port.lv2/resize-port.h"
namespace Ingen {
diff --git a/src/engine/LV2Node.cpp b/src/engine/LV2Node.cpp
index cc3e3ca0..6294a23d 100644
--- a/src/engine/LV2Node.cpp
+++ b/src/engine/LV2Node.cpp
@@ -202,7 +202,7 @@ LV2Node::instantiate(BufferFactory& bufs)
"http://lv2plug.in/ns/lv2core#portProperty");
SLV2Value supports_pred = slv2_value_new_uri(info->lv2_world(),
- LV2_OBJECT_URI "#supports");
+ LV2_ATOM_URI "#supports");
//SLV2Value as_large_as_pred = slv2_value_new_uri(info->lv2_world(),
// "http://lv2plug.in/ns/dev/resize-port#asLargeAs");
diff --git a/src/engine/MessageContext.hpp b/src/engine/MessageContext.hpp
index e8067d9a..3073f97d 100644
--- a/src/engine/MessageContext.hpp
+++ b/src/engine/MessageContext.hpp
@@ -23,7 +23,7 @@
#include "raul/Thread.hpp"
#include "raul/Semaphore.hpp"
#include "raul/AtomicPtr.hpp"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
#include "Context.hpp"
#include "ProcessContext.hpp"
#include "ThreadManager.hpp"
diff --git a/src/engine/ObjectBuffer.cpp b/src/engine/ObjectBuffer.cpp
index 5a3462cc..6082e978 100644
--- a/src/engine/ObjectBuffer.cpp
+++ b/src/engine/ObjectBuffer.cpp
@@ -36,17 +36,17 @@ using namespace Shared;
/** Allocate a new object buffer.
- * \a capacity is in bytes, including LV2_Object header
+ * \a capacity is in bytes, including LV2_Atom header
*/
ObjectBuffer::ObjectBuffer(BufferFactory& bufs, size_t capacity)
: Buffer(bufs, PortType(PortType::VALUE), capacity)
{
- capacity += sizeof(LV2_Object);
+ capacity += sizeof(LV2_Atom);
#ifdef HAVE_POSIX_MEMALIGN
const int ret = posix_memalign((void**)&_buf, 16, capacity);
#else
- _buf = (LV2_Object*)malloc(capacity);
+ _buf = (LV2_Atom*)malloc(capacity);
const int ret = (_buf != NULL) ? 0 : -1;
#endif
@@ -83,17 +83,17 @@ ObjectBuffer::copy(Context& context, const Buffer* src_buf)
// Copy only if src is a POD object that fits
if (src->_buf->type != 0 && src_buf->size() <= size())
- memcpy(_buf, src->_buf, sizeof(LV2_Object) + src_buf->size());
+ memcpy(_buf, src->_buf, sizeof(LV2_Atom) + src_buf->size());
}
void
ObjectBuffer::resize(size_t size)
{
- const uint32_t contents_size = sizeof(LV2_Object) + _buf->size;
+ const uint32_t contents_size = sizeof(LV2_Atom) + _buf->size;
- _buf = (LV2_Object*)realloc(_buf, sizeof(LV2_Object) + size);
- _size = size + sizeof(LV2_Object);
+ _buf = (LV2_Atom*)realloc(_buf, sizeof(LV2_Atom) + size);
+ _size = size + sizeof(LV2_Atom);
// If we shrunk and chopped the current contents, clear corrupt data
if (size < contents_size)
@@ -109,9 +109,9 @@ ObjectBuffer::port_data(PortType port_type, SampleCount offset)
case PortType::AUDIO:
switch (_type.symbol()) {
case PortType::CONTROL:
- return (float*)object()->body;
+ return (float*)atom()->body;
case PortType::AUDIO:
- return (float*)((LV2_Vector_Body*)object()->body)->elems + offset;
+ return (float*)((LV2_Vector_Body*)atom()->body)->elems + offset;
default:
warn << "Audio data requested from non-audio buffer" << endl;
return NULL;
@@ -131,9 +131,9 @@ ObjectBuffer::port_data(PortType port_type, SampleCount offset) const
case PortType::AUDIO:
switch (_type.symbol()) {
case PortType::CONTROL:
- return (float*)object()->body;
+ return (float*)atom()->body;
case PortType::AUDIO:
- return (float*)((LV2_Vector_Body*)object()->body)->elems + offset;
+ return (float*)((LV2_Vector_Body*)atom()->body)->elems + offset;
default:
warn << "Audio data requested from non-audio buffer" << endl;
return NULL;
@@ -148,7 +148,7 @@ ObjectBuffer::port_data(PortType port_type, SampleCount offset) const
void
ObjectBuffer::prepare_write(Context& context)
{
- _buf->size = _size - sizeof(LV2_Object);
+ _buf->size = _size - sizeof(LV2_Atom);
}
diff --git a/src/engine/ObjectBuffer.hpp b/src/engine/ObjectBuffer.hpp
index 7cea89fc..865c3c3c 100644
--- a/src/engine/ObjectBuffer.hpp
+++ b/src/engine/ObjectBuffer.hpp
@@ -19,7 +19,7 @@
#define INGEN_ENGINE_OBJECTBUFFER_HPP
#include "raul/Atom.hpp"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
#include "interface/PortType.hpp"
#include "Buffer.hpp"
@@ -43,11 +43,11 @@ public:
void resize(size_t size);
- LV2_Object* object() { return _buf; }
- const LV2_Object* object() const { return _buf; }
+ LV2_Atom* atom() { return _buf; }
+ const LV2_Atom* atom() const { return _buf; }
private:
- LV2_Object* _buf; ///< Contents
+ LV2_Atom* _buf; ///< Contents
};
diff --git a/src/engine/PortImpl.cpp b/src/engine/PortImpl.cpp
index 0a8de1de..ebb358e5 100644
--- a/src/engine/PortImpl.cpp
+++ b/src/engine/PortImpl.cpp
@@ -227,7 +227,7 @@ PortImpl::broadcast_value(Context& context, bool force)
break;
case PortType::VALUE:
case PortType::MESSAGE:
- LV2Object::to_atom(_bufs.uris(), ((ObjectBuffer*)buffer(0).get())->object(), val);
+ LV2Object::to_atom(_bufs.uris(), ((ObjectBuffer*)buffer(0).get())->atom(), val);
break;
}
diff --git a/src/engine/events/RequestMetadata.cpp b/src/engine/events/RequestMetadata.cpp
index 5efc7072..850ecc3d 100644
--- a/src/engine/events/RequestMetadata.cpp
+++ b/src/engine/events/RequestMetadata.cpp
@@ -101,7 +101,7 @@ RequestMetadata::execute(ProcessContext& context)
} else {
IntrusivePtr<ObjectBuffer> obuf = PtrCast<ObjectBuffer>(port->buffer(0));
if (obuf) {
- LV2Object::to_atom(*_engine.world()->uris().get(), obuf->object(), _value);
+ LV2Object::to_atom(*_engine.world()->uris().get(), obuf->atom(), _value);
}
}
} else {
diff --git a/src/engine/events/SetPortValue.cpp b/src/engine/events/SetPortValue.cpp
index 1a41938d..6488fd6c 100644
--- a/src/engine/events/SetPortValue.cpp
+++ b/src/engine/events/SetPortValue.cpp
@@ -175,10 +175,10 @@ SetPortValue::apply(Context& context)
ObjectBuffer* const obuf = dynamic_cast<ObjectBuffer*>(buf);
if (obuf) {
- obuf->object()->size = obuf->size() - sizeof(LV2_Object);
- if (LV2Object::from_atom(uris, _value, obuf->object())) {
- debug << "Converted atom " << _value << " :: " << obuf->object()->type
- << " * " << obuf->object()->size << " @ " << obuf->object() << endl;
+ obuf->atom()->size = obuf->size() - sizeof(LV2_Atom);
+ if (LV2Object::from_atom(uris, _value, obuf->atom())) {
+ debug << "Converted atom " << _value << " :: " << obuf->atom()->type
+ << " * " << obuf->atom()->size << " @ " << obuf->atom() << endl;
return;
} else {
warn << "Failed to convert atom to LV2 object" << endl;
diff --git a/src/shared/LV2Object.cpp b/src/shared/LV2Object.cpp
index 4388ede8..9000320f 100644
--- a/src/shared/LV2Object.cpp
+++ b/src/shared/LV2Object.cpp
@@ -18,7 +18,7 @@
#include "raul/log.hpp"
#include "raul/Atom.hpp"
#include "uri-map.lv2/uri-map.h"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
#include "LV2Features.hpp"
#include "LV2Object.hpp"
#include "LV2URIMap.hpp"
@@ -32,7 +32,7 @@ namespace LV2Object {
bool
-to_atom(const Shared::LV2URIMap& uris, const LV2_Object* object, Raul::Atom& atom)
+to_atom(const Shared::LV2URIMap& uris, const LV2_Atom* object, Raul::Atom& atom)
{
if (object->type == uris.object_class_string.id) {
atom = Raul::Atom((char*)(object + 1));
@@ -55,7 +55,7 @@ to_atom(const Shared::LV2URIMap& uris, const LV2_Object* object, Raul::Atom& ato
* object->size should be the capacity of the object (not including header)
*/
bool
-from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Object* object)
+from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Atom* object)
{
char* str;
switch (atom.type()) {
diff --git a/src/shared/LV2Object.hpp b/src/shared/LV2Object.hpp
index bec2ff89..5b50d726 100644
--- a/src/shared/LV2Object.hpp
+++ b/src/shared/LV2Object.hpp
@@ -19,7 +19,7 @@
#define INGEN_SHARED_LV2OBJECT_HPP
namespace Raul { class Atom; }
-typedef struct _LV2_Object LV2_Object;
+typedef struct _LV2_Atom LV2_Atom;
namespace Ingen {
namespace Shared {
@@ -29,8 +29,8 @@ class LV2URIMap;
namespace LV2Object {
- bool to_atom(const Shared::LV2URIMap& uris, const LV2_Object* object, Raul::Atom& atom);
- bool from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Object* object);
+ bool to_atom(const Shared::LV2URIMap& uris, const LV2_Atom* object, Raul::Atom& atom);
+ bool from_atom(const Shared::LV2URIMap& uris, const Raul::Atom& atom, LV2_Atom* object);
} // namespace LV2Object
diff --git a/src/shared/LV2URIMap.cpp b/src/shared/LV2URIMap.cpp
index e069a644..e8de602a 100644
--- a/src/shared/LV2URIMap.cpp
+++ b/src/shared/LV2URIMap.cpp
@@ -21,7 +21,7 @@
#include <glib.h>
#include <boost/shared_ptr.hpp>
#include "raul/log.hpp"
-#include "object.lv2/object.h"
+#include "atom.lv2/atom.h"
#include "LV2URIMap.hpp"
using namespace std;
@@ -99,12 +99,12 @@ LV2URIMap::LV2URIMap()
, obj_MessagePort("http://lv2plug.in/ns/dev/objects#MessagePort")
, obj_ValuePort("http://lv2plug.in/ns/dev/objects#ValuePort")
, obj_supports("http://lv2plug.in/ns/dev/objects#supports")
- , object_class_bool(LV2_OBJECT_URI "#Bool")
- , object_class_float32(LV2_OBJECT_URI "#Float32")
- , object_class_int32(LV2_OBJECT_URI "#Int32")
- , object_class_string(LV2_OBJECT_URI "#String")
- , object_class_vector(LV2_OBJECT_URI "#Vector")
- , object_transfer(LV2_OBJECT_URI "#ObjectTransfer")
+ , object_class_bool(LV2_ATOM_URI "#Bool")
+ , object_class_float32(LV2_ATOM_URI "#Float32")
+ , object_class_int32(LV2_ATOM_URI "#Int32")
+ , object_class_string(LV2_ATOM_URI "#String")
+ , object_class_vector(LV2_ATOM_URI "#Vector")
+ , object_transfer(LV2_ATOM_URI "#ObjectTransfer")
, rdf_instanceOf(NS_RDF "instanceOf")
, rdf_type(NS_RDF "type")
, rdfs_seeAlso(NS_RDFS "seeAlso")
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-26 06:36:04 +0000