diff options
Diffstat (limited to 'src/server/events')
| -rw-r--r-- | src/server/events/CreatePort.cpp | 4 | ||||
| -rw-r--r-- | src/server/events/Delta.cpp | 4 | ||||
| -rw-r--r-- | src/server/events/SetPortValue.cpp | 12 | ||||
| -rw-r--r-- | src/server/events/SetPortValue.hpp | 16 |
4 files changed, 18 insertions, 18 deletions
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; }; |