summaryrefslogtreecommitdiffstats
path: root/src/server
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-02-23 19:55:13 +0000
committerDavid Robillard <d@drobilla.net>2013-02-23 19:55:13 +0000
commit6b6cb56b2ceab509569bfca247f108f2be5e25c0 (patch)
tree5a46eee0c3f518fa7bb20e6a8784e5bd3ba04598 /src/server
parent5a6aafff8dda9dddce479a2ad86edb933c9688c3 (diff)
downloadingen-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/server')
-rw-r--r--src/server/Broadcaster.hpp6
-rw-r--r--src/server/BufferFactory.hpp2
-rw-r--r--src/server/Context.cpp34
-rw-r--r--src/server/Context.hpp14
-rw-r--r--src/server/ControlBindings.cpp30
-rw-r--r--src/server/ControlBindings.hpp30
-rw-r--r--src/server/DuplexPort.cpp2
-rw-r--r--src/server/DuplexPort.hpp2
-rw-r--r--src/server/EventWriter.cpp6
-rw-r--r--src/server/EventWriter.hpp4
-rw-r--r--src/server/GraphImpl.cpp2
-rw-r--r--src/server/InputPort.cpp2
-rw-r--r--src/server/InputPort.hpp4
-rw-r--r--src/server/LV2Block.cpp10
-rw-r--r--src/server/NodeImpl.cpp4
-rw-r--r--src/server/NodeImpl.hpp2
-rw-r--r--src/server/OutputPort.cpp2
-rw-r--r--src/server/OutputPort.hpp4
-rw-r--r--src/server/PortImpl.cpp2
-rw-r--r--src/server/PortImpl.hpp22
-rw-r--r--src/server/events/CreatePort.cpp4
-rw-r--r--src/server/events/Delta.cpp4
-rw-r--r--src/server/events/SetPortValue.cpp12
-rw-r--r--src/server/events/SetPortValue.hpp16
-rw-r--r--src/server/ingen_jack.cpp4
-rw-r--r--src/server/internals/Controller.cpp2
-rw-r--r--src/server/internals/Note.cpp2
-rw-r--r--src/server/internals/Time.cpp2
-rw-r--r--src/server/internals/Trigger.cpp2
29 files changed, 118 insertions, 114 deletions
diff --git a/src/server/Broadcaster.hpp b/src/server/Broadcaster.hpp
index 3a7eaf44..b77773fe 100644
--- a/src/server/Broadcaster.hpp
+++ b/src/server/Broadcaster.hpp
@@ -127,9 +127,9 @@ public:
BROADCAST(disconnect_all, graph, path);
}
- void set_property(const Raul::URI& subject,
- const Raul::URI& predicate,
- const Raul::Atom& value) {
+ void set_property(const Raul::URI& subject,
+ const Raul::URI& predicate,
+ const Atom& value) {
BROADCAST(set_property, subject, predicate, value);
}
diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 3bbc542e..b3740bd0 100644
--- a/src/server/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -21,10 +21,10 @@
#include <map>
#include <mutex>
+#include "ingen/Atom.hpp"
#include "ingen/Forge.hpp"
#include "ingen/URIs.hpp"
#include "ingen/types.hpp"
-#include "raul/Atom.hpp"
#include "raul/RingBuffer.hpp"
#include "BufferRef.hpp"
diff --git a/src/server/Context.cpp b/src/server/Context.cpp
index 2ac2ddc2..90e3e184 100644
--- a/src/server/Context.cpp
+++ b/src/server/Context.cpp
@@ -29,19 +29,19 @@ namespace Server {
struct Notification
{
- inline Notification(PortImpl* p = 0,
- FrameTime f = 0,
- LV2_URID k = 0,
- uint32_t s = 0,
- Raul::Atom::TypeID t = 0)
+ inline Notification(PortImpl* p = 0,
+ FrameTime f = 0,
+ LV2_URID k = 0,
+ uint32_t s = 0,
+ LV2_URID t = 0)
: port(p), time(f), key(k), size(s), type(t)
{}
- PortImpl* port;
- FrameTime time;
- LV2_URID key;
- uint32_t size;
- Raul::Atom::TypeID type;
+ PortImpl* port;
+ FrameTime time;
+ LV2_URID key;
+ uint32_t size;
+ LV2_URID type;
};
Context::Context(Engine& engine, ID id)
@@ -61,12 +61,12 @@ Context::must_notify(const PortImpl* port) const
}
bool
-Context::notify(LV2_URID key,
- FrameTime time,
- PortImpl* port,
- uint32_t size,
- Raul::Atom::TypeID type,
- const void* body)
+Context::notify(LV2_URID key,
+ FrameTime time,
+ PortImpl* port,
+ uint32_t size,
+ LV2_URID type,
+ const void* body)
{
const Notification n(port, time, key, size, type);
if (_event_sink.write_space() < sizeof(n) + size) {
@@ -94,7 +94,7 @@ Context::emit_notifications(FrameTime end)
return;
}
if (_event_sink.read(sizeof(note), &note) == sizeof(note)) {
- Raul::Atom value = _engine.world()->forge().alloc(
+ Atom value = _engine.world()->forge().alloc(
note.size, note.type, NULL);
if (_event_sink.read(note.size, value.get_body()) == note.size) {
i += note.size;
diff --git a/src/server/Context.hpp b/src/server/Context.hpp
index ea3593b8..076622eb 100644
--- a/src/server/Context.hpp
+++ b/src/server/Context.hpp
@@ -17,8 +17,8 @@
#ifndef INGEN_ENGINE_CONTEXT_HPP
#define INGEN_ENGINE_CONTEXT_HPP
+#include "ingen/Atom.hpp"
#include "ingen/World.hpp"
-#include "raul/Atom.hpp"
#include "raul/RingBuffer.hpp"
#include "types.hpp"
@@ -64,12 +64,12 @@ public:
/** Send a notification from this run context.
* @return false on failure (ring is full)
*/
- bool notify(LV2_URID key = 0,
- FrameTime time = 0,
- PortImpl* port = 0,
- uint32_t size = 0,
- Raul::Atom::TypeID type = 0,
- const void* body = NULL);
+ bool notify(LV2_URID key = 0,
+ FrameTime time = 0,
+ PortImpl* port = 0,
+ uint32_t size = 0,
+ LV2_URID type = 0,
+ const void* body = NULL);
/** Emit pending notifications in some other non-realtime thread. */
void emit_notifications(FrameTime end);
diff --git a/src/server/ControlBindings.cpp b/src/server/ControlBindings.cpp
index 12a895f7..60e5c4e0 100644
--- a/src/server/ControlBindings.cpp
+++ b/src/server/ControlBindings.cpp
@@ -58,12 +58,12 @@ ControlBindings::port_binding(PortImpl* port) const
{
ThreadManager::assert_thread(THREAD_PRE_PROCESS);
const Ingen::URIs& uris = _engine.world()->uris();
- const Raul::Atom& binding = port->get_property(uris.ingen_controlBinding);
+ const Atom& binding = port->get_property(uris.ingen_controlBinding);
return binding_key(binding);
}
ControlBindings::Key
-ControlBindings::binding_key(const Raul::Atom& binding) const
+ControlBindings::binding_key(const Atom& binding) const
{
const Ingen::URIs& uris = _engine.world()->uris();
Key key;
@@ -124,9 +124,9 @@ ControlBindings::midi_event_key(uint16_t size, const uint8_t* buf, uint16_t& val
}
void
-ControlBindings::port_binding_changed(ProcessContext& context,
- PortImpl* port,
- const Raul::Atom& binding)
+ControlBindings::port_binding_changed(ProcessContext& context,
+ PortImpl* port,
+ const Atom& binding)
{
const Key key = binding_key(binding);
if (key) {
@@ -135,10 +135,10 @@ ControlBindings::port_binding_changed(ProcessContext& context,
}
void
-ControlBindings::port_value_changed(ProcessContext& context,
- PortImpl* port,
- Key key,
- const Raul::Atom& value_atom)
+ControlBindings::port_value_changed(ProcessContext& context,
+ PortImpl* port,
+ Key key,
+ const Atom& value_atom)
{
Ingen::World* world = context.engine().world();
const Ingen::URIs& uris = world->uris();
@@ -202,7 +202,7 @@ get_range(ProcessContext& context, const PortImpl* port, float* min, float* max)
}
}
-Raul::Atom
+Atom
ControlBindings::control_to_port_value(ProcessContext& context,
const PortImpl* port,
Type type,
@@ -235,10 +235,10 @@ ControlBindings::control_to_port_value(ProcessContext& context,
}
int16_t
-ControlBindings::port_value_to_control(ProcessContext& context,
- PortImpl* port,
- Type type,
- const Raul::Atom& value_atom) const
+ControlBindings::port_value_to_control(ProcessContext& context,
+ PortImpl* port,
+ Type type,
+ const Atom& value_atom) const
{
if (value_atom.type() != port->bufs().forge().Float)
return 0;
@@ -314,7 +314,7 @@ ControlBindings::set_port_value(ProcessContext& context,
float min, max;
get_range(context, port, &min, &max);
- const Raul::Atom port_value(control_to_port_value(context, port, type, value));
+ const Atom port_value(control_to_port_value(context, port, type, value));
assert(port_value.type() == port->bufs().forge().Float);
port->set_value(port_value); // FIXME: not thread safe
diff --git a/src/server/ControlBindings.hpp b/src/server/ControlBindings.hpp
index 26e9dd93..57a361c2 100644
--- a/src/server/ControlBindings.hpp
+++ b/src/server/ControlBindings.hpp
@@ -20,9 +20,9 @@
#include <map>
#include <stdint.h>
+#include "ingen/Atom.hpp"
#include "ingen/types.hpp"
#include "lv2/lv2plug.in/ns/ext/atom/forge.h"
-#include "raul/Atom.hpp"
#include "raul/Path.hpp"
#include "BufferFactory.hpp"
@@ -62,18 +62,18 @@ public:
~ControlBindings();
Key port_binding(PortImpl* port) const;
- Key binding_key(const Raul::Atom& binding) const;
+ Key binding_key(const Atom& binding) const;
void learn(PortImpl* port);
void port_binding_changed(ProcessContext& context,
PortImpl* port,
- const Raul::Atom& binding);
+ const Atom& binding);
void port_value_changed(ProcessContext& context,
PortImpl* port,
Key key,
- const Raul::Atom& value);
+ const Atom& value);
void pre_process(ProcessContext& context, Buffer* control_in);
void post_process(ProcessContext& context, Buffer* control_out);
@@ -93,18 +93,22 @@ public:
private:
Key midi_event_key(uint16_t size, const uint8_t* buf, uint16_t& value);
- void set_port_value(ProcessContext& context, PortImpl* port, Type type, int16_t value);
+ void set_port_value(ProcessContext& context,
+ PortImpl* port,
+ Type type,
+ int16_t value);
+
bool bind(ProcessContext& context, Key key);
- Raul::Atom control_to_port_value(ProcessContext& context,
- const PortImpl* port,
- Type type,
- int16_t value) const;
+ Atom control_to_port_value(ProcessContext& context,
+ const PortImpl* port,
+ Type type,
+ int16_t value) const;
- int16_t port_value_to_control(ProcessContext& context,
- PortImpl* port,
- Type type,
- const Raul::Atom& value) const;
+ int16_t port_value_to_control(ProcessContext& context,
+ PortImpl* port,
+ Type type,
+ const Atom& value) const;
Engine& _engine;
PortImpl* _learn_port;
diff --git a/src/server/DuplexPort.cpp b/src/server/DuplexPort.cpp
index 65152d02..6049e001 100644
--- a/src/server/DuplexPort.cpp
+++ b/src/server/DuplexPort.cpp
@@ -34,7 +34,7 @@ DuplexPort::DuplexPort(BufferFactory& bufs,
uint32_t poly,
PortType type,
LV2_URID buffer_type,
- const Raul::Atom& value,
+ const Atom& value,
size_t buffer_size,
bool is_output)
: PortImpl(bufs, parent, symbol, index, poly, type, buffer_type, value, buffer_size)
diff --git a/src/server/DuplexPort.hpp b/src/server/DuplexPort.hpp
index 55ba8fa0..a7ad58bd 100644
--- a/src/server/DuplexPort.hpp
+++ b/src/server/DuplexPort.hpp
@@ -50,7 +50,7 @@ public:
uint32_t poly,
PortType type,
LV2_URID buffer_type,
- const Raul::Atom& value,
+ const Atom& value,
size_t buffer_size,
bool is_output);
diff --git a/src/server/EventWriter.cpp b/src/server/EventWriter.cpp
index 0c27bc5f..27435511 100644
--- a/src/server/EventWriter.cpp
+++ b/src/server/EventWriter.cpp
@@ -112,9 +112,9 @@ EventWriter::disconnect_all(const Raul::Path& graph,
}
void
-EventWriter::set_property(const Raul::URI& uri,
- const Raul::URI& predicate,
- const Raul::Atom& value)
+EventWriter::set_property(const Raul::URI& uri,
+ const Raul::URI& predicate,
+ const Atom& value)
{
Resource::Properties remove;
remove.insert(
diff --git a/src/server/EventWriter.hpp b/src/server/EventWriter.hpp
index 6d0fd2d2..89493051 100644
--- a/src/server/EventWriter.hpp
+++ b/src/server/EventWriter.hpp
@@ -74,8 +74,8 @@ public:
const Raul::Path& head);
virtual void set_property(const Raul::URI& subject_path,
- const Raul::URI& predicate,
- const Raul::Atom& value);
+ const Raul::URI& predicate,
+ const Atom& value);
virtual void del(const Raul::URI& uri);
diff --git a/src/server/GraphImpl.cpp b/src/server/GraphImpl.cpp
index f31994b9..8621106f 100644
--- a/src/server/GraphImpl.cpp
+++ b/src/server/GraphImpl.cpp
@@ -245,7 +245,7 @@ GraphImpl::create_port(BufferFactory& bufs,
return NULL;
}
- Raul::Atom value;
+ Atom value;
if (type == PortType::CONTROL || type == PortType::CV)
value = bufs.forge().make(0.0f);
diff --git a/src/server/InputPort.cpp b/src/server/InputPort.cpp
index 0d1a2d0e..34c71116 100644
--- a/src/server/InputPort.cpp
+++ b/src/server/InputPort.cpp
@@ -43,7 +43,7 @@ InputPort::InputPort(BufferFactory& bufs,
uint32_t poly,
PortType type,
LV2_URID buffer_type,
- const Raul::Atom& value,
+ const Atom& value,
size_t buffer_size)
: PortImpl(bufs, parent, symbol, index, poly, type, buffer_type, value, buffer_size)
, _num_arcs(0)
diff --git a/src/server/InputPort.hpp b/src/server/InputPort.hpp
index 1f82425e..d1082b71 100644
--- a/src/server/InputPort.hpp
+++ b/src/server/InputPort.hpp
@@ -57,8 +57,8 @@ public:
uint32_t poly,
PortType type,
LV2_URID buffer_type,
- const Raul::Atom& value,
- size_t buffer_size=0);
+ const Atom& value,
+ size_t buffer_size = 0);
virtual ~InputPort() {}
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp
index fba06b19..66ac0d70 100644
--- a/src/server/LV2Block.cpp
+++ b/src/server/LV2Block.cpp
@@ -230,11 +230,11 @@ LV2Block::instantiate(BufferFactory& bufs)
lilv_node_as_string(lilv_port_get_symbol(plug, id)));
// Get port type
- Raul::Atom val;
- PortType port_type = PortType::UNKNOWN;
- LV2_URID buffer_type = 0;
- bool is_morph = false;
- bool is_auto_morph = false;
+ Atom val;
+ PortType port_type = PortType::UNKNOWN;
+ LV2_URID buffer_type = 0;
+ bool is_morph = false;
+ bool is_auto_morph = false;
if (lilv_port_is_a(plug, id, info->lv2_ControlPort)) {
if (lilv_port_is_a(plug, id, info->morph_MorphPort)) {
is_morph = true;
diff --git a/src/server/NodeImpl.cpp b/src/server/NodeImpl.cpp
index 3fe7a2a4..4d7a42b6 100644
--- a/src/server/NodeImpl.cpp
+++ b/src/server/NodeImpl.cpp
@@ -33,11 +33,11 @@ NodeImpl::NodeImpl(Ingen::URIs& uris,
{
}
-const Raul::Atom&
+const Atom&
NodeImpl::get_property(const Raul::URI& key) const
{
ThreadManager::assert_not_thread(THREAD_PROCESS);
- static const Raul::Atom null_atom;
+ static const Atom null_atom;
Resource::Properties::const_iterator i = properties().find(key);
return (i != properties().end()) ? i->second : null_atom;
}
diff --git a/src/server/NodeImpl.hpp b/src/server/NodeImpl.hpp
index 60aa2d3d..a51d6fe5 100644
--- a/src/server/NodeImpl.hpp
+++ b/src/server/NodeImpl.hpp
@@ -67,7 +67,7 @@ public:
set_uri(Node::path_to_uri(new_path));
}
- const Raul::Atom& get_property(const Raul::URI& key) const;
+ const Atom& get_property(const Raul::URI& key) const;
/** The Graph this object is a child of. */
virtual GraphImpl* parent_graph() const;
diff --git a/src/server/OutputPort.cpp b/src/server/OutputPort.cpp
index 492e5419..881c6782 100644
--- a/src/server/OutputPort.cpp
+++ b/src/server/OutputPort.cpp
@@ -34,7 +34,7 @@ OutputPort::OutputPort(BufferFactory& bufs,
uint32_t poly,
PortType type,
LV2_URID buffer_type,
- const Raul::Atom& value,
+ const Atom& value,
size_t buffer_size)
: PortImpl(bufs, parent, symbol, index, poly, type, buffer_type, value, buffer_size)
{
diff --git a/src/server/OutputPort.hpp b/src/server/OutputPort.hpp
index b117847f..1fe8c957 100644
--- a/src/server/OutputPort.hpp
+++ b/src/server/OutputPort.hpp
@@ -45,8 +45,8 @@ public:
uint32_t poly,
PortType type,
LV2_URID buffer_type,
- const Raul::Atom& value,
- size_t buffer_size=0);
+ const Atom& value,
+ size_t buffer_size = 0);
virtual ~OutputPort() {}
diff --git a/src/server/PortImpl.cpp b/src/server/PortImpl.cpp
index f1dacd68..b3590d1f 100644
--- a/src/server/PortImpl.cpp
+++ b/src/server/PortImpl.cpp
@@ -50,7 +50,7 @@ PortImpl::PortImpl(BufferFactory& bufs,
uint32_t poly,
PortType type,
LV2_URID buffer_type,
- const Raul::Atom& value,
+ const Atom& value,
size_t buffer_size)
: NodeImpl(bufs.uris(), block, name)
, _bufs(bufs)
diff --git a/src/server/PortImpl.hpp b/src/server/PortImpl.hpp
index f4c80aaf..c980a134 100644
--- a/src/server/PortImpl.hpp
+++ b/src/server/PortImpl.hpp
@@ -19,8 +19,8 @@
#include <cstdlib>
+#include "ingen/Atom.hpp"
#include "raul/Array.hpp"
-#include "raul/Atom.hpp"
#include "BufferRef.hpp"
#include "NodeImpl.hpp"
@@ -72,18 +72,18 @@ public:
virtual bool apply_poly(
ProcessContext& context, Raul::Maid& maid, uint32_t poly);
- const Raul::Atom& value() const { return _value; }
- void set_value(const Raul::Atom& v) { _value = v; }
+ const Atom& value() const { return _value; }
+ void set_value(const Atom& v) { _value = v; }
- const Raul::Atom& minimum() const { return _min; }
- const Raul::Atom& maximum() const { return _max; }
+ const Atom& minimum() const { return _min; }
+ const Atom& maximum() const { return _max; }
/* The following two methods store the range in variables so it can be
accessed in the process thread, which is required for applying control
bindings from incoming MIDI data.
*/
- void set_minimum(const Raul::Atom& min) { _min = min; }
- void set_maximum(const Raul::Atom& max) { _max = max; }
+ void set_minimum(const Atom& min) { _min = min; }
+ void set_maximum(const Atom& max) { _max = max; }
inline BufferRef buffer(uint32_t voice) const {
return _buffers->at((_poly == 1) ? 0 : voice);
@@ -189,7 +189,7 @@ protected:
uint32_t poly,
PortType type,
LV2_URID buffer_type,
- const Raul::Atom& value,
+ const Atom& value,
size_t buffer_size);
struct SetState {
@@ -211,9 +211,9 @@ protected:
float _peak;
PortType _type;
LV2_URID _buffer_type;
- Raul::Atom _value;
- Raul::Atom _min;
- Raul::Atom _max;
+ Atom _value;
+ Atom _min;
+ Atom _max;
Raul::Array<SetState>* _set_states;
Raul::Array<SetState>* _prepared_set_states;
Raul::Array<BufferRef>* _buffers;
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 4687e44e..a5fea0da 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -16,11 +16,11 @@
#include <utility>
+#include "ingen/Atom.hpp"
#include "ingen/Store.hpp"
#include "ingen/URIMap.hpp"
#include "ingen/URIs.hpp"
#include "raul/Array.hpp"
-#include "raul/Atom.hpp"
#include "raul/Path.hpp"
#include "Broadcaster.hpp"
@@ -62,7 +62,7 @@ CreatePort::CreatePort(Engine& engine,
const Range types = properties.equal_range(uris.rdf_type);
for (Iterator i = types.first; i != types.second; ++i) {
- const Raul::Atom& type = i->second;
+ const Atom& type = i->second;
if (type == uris.lv2_AudioPort) {
_port_type = PortType::AUDIO;
} else if (type == uris.lv2_ControlPort) {
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index 28eccc71..f8a5b23c 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -150,7 +150,7 @@ Delta::pre_process()
for (const auto& r : _remove) {
const Raul::URI& key = r.first;
- const Raul::Atom& value = r.second;
+ const Atom& value = r.second;
if (key == uris.ingen_controlBinding && value == uris.wildcard) {
PortImpl* port = dynamic_cast<PortImpl*>(_object);
if (port)
@@ -289,7 +289,7 @@ Delta::execute(ProcessContext& context)
std::vector<SpecialType>::const_iterator t = _types.begin();
for (const auto& p : _properties) {
const Raul::URI& key = p.first;
- const Raul::Atom& value = p.second;
+ const Atom& value = p.second;
switch (*t) {
case SpecialType::ENABLE_BROADCAST:
if (port) {
diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp
index 0d68b1af..6b149ee2 100644
--- a/src/server/events/SetPortValue.cpp
+++ b/src/server/events/SetPortValue.cpp
@@ -34,12 +34,12 @@ namespace Server {
namespace Events {
/** Internal */
-SetPortValue::SetPortValue(Engine& engine,
- SPtr<Interface> client,
- int32_t id,
- SampleCount timestamp,
- PortImpl* port,
- const Raul::Atom& value)
+SetPortValue::SetPortValue(Engine& engine,
+ SPtr<Interface> client,
+ int32_t id,
+ SampleCount timestamp,
+ PortImpl* port,
+ const Atom& value)
: Event(engine, client, id, timestamp)
, _port(port)
, _value(value)
diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp
index 32e8f768..0c4e8b11 100644
--- a/src/server/events/SetPortValue.hpp
+++ b/src/server/events/SetPortValue.hpp
@@ -17,7 +17,7 @@
#ifndef INGEN_EVENTS_SETPORTVALUE_HPP
#define INGEN_EVENTS_SETPORTVALUE_HPP
-#include "raul/Atom.hpp"
+#include "ingen/Atom.hpp"
#include "ControlBindings.hpp"
#include "Event.hpp"
@@ -37,12 +37,12 @@ namespace Events {
class SetPortValue : public Event
{
public:
- SetPortValue(Engine& engine,
- SPtr<Interface> client,
- int32_t id,
- SampleCount timestamp,
- PortImpl* port,
- const Raul::Atom& value);
+ SetPortValue(Engine& engine,
+ SPtr<Interface> client,
+ int32_t id,
+ SampleCount timestamp,
+ PortImpl* port,
+ const Atom& value);
~SetPortValue();
@@ -54,7 +54,7 @@ private:
void apply(Context& context);
PortImpl* _port;
- const Raul::Atom _value;
+ const Atom _value;
ControlBindings::Key _binding;
};
diff --git a/src/server/ingen_jack.cpp b/src/server/ingen_jack.cpp
index 07b80876..474dca73 100644
--- a/src/server/ingen_jack.cpp
+++ b/src/server/ingen_jack.cpp
@@ -16,12 +16,12 @@
#include <string>
+#include "ingen/Atom.hpp"
#include "ingen/Configuration.hpp"
#include "ingen/Configuration.hpp"
#include "ingen/Log.hpp"
#include "ingen/Module.hpp"
#include "ingen/World.hpp"
-#include "raul/Atom.hpp"
#include "JackDriver.hpp"
#include "Engine.hpp"
@@ -38,7 +38,7 @@ struct IngenJackModule : public Ingen::Module {
Server::JackDriver* driver = new Server::JackDriver(
*(Server::Engine*)world->engine().get());
- const Raul::Atom& s = world->conf().option("jack-server");
+ const Atom& s = world->conf().option("jack-server");
const std::string server_name = s.is_valid() ? s.ptr<char>() : "";
driver->attach(server_name,
world->conf().option("jack-name").ptr<char>(),
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index 5c3bf6f6..dd693eb3 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -54,7 +54,7 @@ ControllerNode::ControllerNode(InternalPlugin* plugin,
_ports = new Raul::Array<PortImpl*>(6);
_midi_in_port = new InputPort(bufs, this, Raul::Symbol("input"), 0, 1,
- PortType::ATOM, uris.atom_Sequence, Raul::Atom());
+ PortType::ATOM, uris.atom_Sequence, Atom());
_midi_in_port->set_property(uris.lv2_name, bufs.forge().alloc("Input"));
_ports->at(0) = _midi_in_port;
diff --git a/src/server/internals/Note.cpp b/src/server/internals/Note.cpp
index 37cebd7e..f7d0e16c 100644
--- a/src/server/internals/Note.cpp
+++ b/src/server/internals/Note.cpp
@@ -61,7 +61,7 @@ NoteNode::NoteNode(InternalPlugin* plugin,
_ports = new Raul::Array<PortImpl*>(6);
_midi_in_port = new InputPort(bufs, this, Raul::Symbol("input"), 0, 1,
- PortType::ATOM, uris.atom_Sequence, Raul::Atom());
+ PortType::ATOM, uris.atom_Sequence, Atom());
_midi_in_port->set_property(uris.lv2_name, bufs.forge().alloc("Input"));
_ports->at(0) = _midi_in_port;
diff --git a/src/server/internals/Time.cpp b/src/server/internals/Time.cpp
index 7fcbccbb..22e714b0 100644
--- a/src/server/internals/Time.cpp
+++ b/src/server/internals/Time.cpp
@@ -49,7 +49,7 @@ TimeNode::TimeNode(InternalPlugin* plugin,
_notify_port = new OutputPort(
bufs, this, Raul::Symbol("notify"), 0, 1,
- PortType::ATOM, uris.atom_Sequence, Raul::Atom(), 1024);
+ PortType::ATOM, uris.atom_Sequence, Atom(), 1024);
_notify_port->set_property(uris.lv2_name, bufs.forge().alloc("Notify"));
_notify_port->set_property(uris.atom_supports,
bufs.forge().make_urid(uris.time_Position));
diff --git a/src/server/internals/Trigger.cpp b/src/server/internals/Trigger.cpp
index 6563e276..78f87b34 100644
--- a/src/server/internals/Trigger.cpp
+++ b/src/server/internals/Trigger.cpp
@@ -54,7 +54,7 @@ TriggerNode::TriggerNode(InternalPlugin* plugin,
_ports = new Raul::Array<PortImpl*>(5);
_midi_in_port = new InputPort(bufs, this, Raul::Symbol("input"), 0, 1,
- PortType::ATOM, uris.atom_Sequence, Raul::Atom());
+ PortType::ATOM, uris.atom_Sequence, Atom());
_midi_in_port->set_property(uris.lv2_name, bufs.forge().alloc("Input"));
_ports->at(0) = _midi_in_port;