summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/Connect.hpp4
-rw-r--r--src/server/events/Copy.cpp18
-rw-r--r--src/server/events/Copy.hpp2
-rw-r--r--src/server/events/CreateBlock.cpp6
-rw-r--r--src/server/events/CreateBlock.hpp6
-rw-r--r--src/server/events/CreateGraph.cpp10
-rw-r--r--src/server/events/CreateGraph.hpp6
-rw-r--r--src/server/events/CreatePort.cpp6
-rw-r--r--src/server/events/CreatePort.hpp6
-rw-r--r--src/server/events/Delete.hpp8
-rw-r--r--src/server/events/Delta.cpp2
-rw-r--r--src/server/events/Delta.hpp2
-rw-r--r--src/server/events/Disconnect.hpp4
-rw-r--r--src/server/events/DisconnectAll.hpp2
-rw-r--r--src/server/events/Mark.hpp2
15 files changed, 42 insertions, 42 deletions
diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp
index e9eadff0..941c0a25 100644
--- a/src/server/events/Connect.hpp
+++ b/src/server/events/Connect.hpp
@@ -66,9 +66,9 @@ private:
const ingen::Connect _msg;
GraphImpl* _graph;
InputPort* _head;
- Raul::managed_ptr<CompiledGraph> _compiled_graph;
+ raul::managed_ptr<CompiledGraph> _compiled_graph;
std::shared_ptr<ArcImpl> _arc;
- Raul::managed_ptr<PortImpl::Voices> _voices;
+ raul::managed_ptr<PortImpl::Voices> _voices;
Properties _tail_remove;
Properties _tail_add;
Properties _head_remove;
diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp
index 3f7fa52e..9ce7ead6 100644
--- a/src/server/events/Copy.cpp
+++ b/src/server/events/Copy.cpp
@@ -66,7 +66,7 @@ Copy::pre_process(PreProcessContext& ctx)
if (uri_is_path(_msg.old_uri)) {
// Old URI is a path within the engine
- const Raul::Path old_path = uri_to_path(_msg.old_uri);
+ const raul::Path old_path = uri_to_path(_msg.old_uri);
// Find the old node
const Store::iterator i = _engine.store()->find(old_path);
@@ -104,8 +104,8 @@ bool
Copy::engine_to_engine(PreProcessContext& ctx)
{
// Only support a single source for now
- const Raul::Path new_path = uri_to_path(_msg.new_uri);
- if (!Raul::Symbol::is_valid(new_path.symbol())) {
+ const raul::Path new_path = uri_to_path(_msg.new_uri);
+ if (!raul::Symbol::is_valid(new_path.symbol())) {
return Event::pre_process_done(Status::BAD_REQUEST);
}
@@ -115,7 +115,7 @@ Copy::engine_to_engine(PreProcessContext& ctx)
}
// Find new parent graph
- const Raul::Path parent_path = new_path.parent();
+ const raul::Path parent_path = new_path.parent();
const Store::iterator p = _engine.store()->find(parent_path);
if (p == _engine.store()->end()) {
return Event::pre_process_done(Status::NOT_FOUND, parent_path);
@@ -126,7 +126,7 @@ Copy::engine_to_engine(PreProcessContext& ctx)
// Create new block
if (!(_block = dynamic_cast<BlockImpl*>(
- _old_block->duplicate(_engine, Raul::Symbol(new_path.symbol()), _parent)))) {
+ _old_block->duplicate(_engine, raul::Symbol(new_path.symbol()), _parent)))) {
return Event::pre_process_done(Status::INTERNAL_ERROR);
}
@@ -189,12 +189,12 @@ Copy::filesystem_to_engine(PreProcessContext&)
// Old URI is a filesystem path and new URI is a path within the engine
const std::string src_path(_msg.old_uri.path());
- const Raul::Path dst_path = uri_to_path(_msg.new_uri);
- boost::optional<Raul::Path> dst_parent;
- boost::optional<Raul::Symbol> dst_symbol;
+ const raul::Path dst_path = uri_to_path(_msg.new_uri);
+ boost::optional<raul::Path> dst_parent;
+ boost::optional<raul::Symbol> dst_symbol;
if (!dst_path.is_root()) {
dst_parent = dst_path.parent();
- dst_symbol = Raul::Symbol(dst_path.symbol());
+ dst_symbol = raul::Symbol(dst_path.symbol());
}
_engine.world().parser()->parse_file(
diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp
index b133a6d6..f9c507f0 100644
--- a/src/server/events/Copy.hpp
+++ b/src/server/events/Copy.hpp
@@ -67,7 +67,7 @@ private:
std::shared_ptr<BlockImpl> _old_block;
GraphImpl* _parent;
BlockImpl* _block;
- Raul::managed_ptr<CompiledGraph> _compiled_graph;
+ raul::managed_ptr<CompiledGraph> _compiled_graph;
};
} // namespace events
diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp
index 4c675f2f..9888b578 100644
--- a/src/server/events/CreateBlock.cpp
+++ b/src/server/events/CreateBlock.cpp
@@ -59,7 +59,7 @@ CreateBlock::CreateBlock(Engine& engine,
const std::shared_ptr<Interface>& client,
int32_t id,
SampleCount timestamp,
- const Raul::Path& path,
+ const raul::Path& path,
Properties& properties)
: Event(engine, client, id, timestamp)
, _path(path)
@@ -120,7 +120,7 @@ CreateBlock::pre_process(PreProcessContext& ctx)
if (!ancestor) {
return Event::pre_process_done(Status::PROTOTYPE_NOT_FOUND, prototype);
} else if (!(_block = ancestor->duplicate(
- _engine, Raul::Symbol(_path.symbol()), _graph))) {
+ _engine, raul::Symbol(_path.symbol()), _graph))) {
return Event::pre_process_done(Status::CREATION_FAILED, _path);
}
@@ -147,7 +147,7 @@ CreateBlock::pre_process(PreProcessContext& ctx)
// Instantiate plugin
if (!(_block = plugin->instantiate(*_engine.buffer_factory(),
- Raul::Symbol(_path.symbol()),
+ raul::Symbol(_path.symbol()),
polyphonic,
_graph,
_engine,
diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp
index 3da589c7..53eff006 100644
--- a/src/server/events/CreateBlock.hpp
+++ b/src/server/events/CreateBlock.hpp
@@ -54,7 +54,7 @@ public:
const std::shared_ptr<Interface>& client,
int32_t id,
SampleCount timestamp,
- const Raul::Path& path,
+ const raul::Path& path,
Properties& properties);
~CreateBlock() override;
@@ -65,12 +65,12 @@ public:
void undo(Interface& target) override;
private:
- Raul::Path _path;
+ raul::Path _path;
Properties& _properties;
ClientUpdate _update;
GraphImpl* _graph;
BlockImpl* _block;
- Raul::managed_ptr<CompiledGraph> _compiled_graph;
+ raul::managed_ptr<CompiledGraph> _compiled_graph;
};
} // namespace events
diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp
index e5dbb55b..ea66ae55 100644
--- a/src/server/events/CreateGraph.cpp
+++ b/src/server/events/CreateGraph.cpp
@@ -54,7 +54,7 @@ CreateGraph::CreateGraph(Engine& engine,
const std::shared_ptr<Interface>& client,
int32_t id,
SampleCount timestamp,
- const Raul::Path& path,
+ const raul::Path& path,
const Properties& properties)
: Event(engine, client, id, timestamp)
, _path(path)
@@ -91,7 +91,7 @@ CreateGraph::build_child_events()
_child_events.push_back(
make_unique<events::CreatePort>(_engine, _request_client, -1, _time,
- _path.child(Raul::Symbol("control")),
+ _path.child(raul::Symbol("control")),
in_properties));
// Add notify port (message respond)
@@ -106,7 +106,7 @@ CreateGraph::build_child_events()
_child_events.push_back(
make_unique<events::CreatePort>(_engine, _request_client, -1, _time,
- _path.child(Raul::Symbol("notify")),
+ _path.child(raul::Symbol("notify")),
out_properties));
}
@@ -118,7 +118,7 @@ CreateGraph::pre_process(PreProcessContext& ctx)
}
if (!_path.is_root()) {
- const Raul::Path up(_path.parent());
+ const raul::Path up(_path.parent());
if (!(_parent = dynamic_cast<GraphImpl*>(_engine.store()->get(up)))) {
return Event::pre_process_done(Status::PARENT_NOT_FOUND, up);
}
@@ -143,7 +143,7 @@ CreateGraph::pre_process(PreProcessContext& ctx)
ext_poly = int_poly;
}
- const Raul::Symbol symbol(_path.is_root() ? "graph" : _path.symbol());
+ const raul::Symbol symbol(_path.is_root() ? "graph" : _path.symbol());
// Get graph prototype
iterator t = _properties.find(uris.lv2_prototype);
diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp
index 6c49feda..e502c4e8 100644
--- a/src/server/events/CreateGraph.hpp
+++ b/src/server/events/CreateGraph.hpp
@@ -54,7 +54,7 @@ public:
const std::shared_ptr<Interface>& client,
int32_t id,
SampleCount timestamp,
- const Raul::Path& path,
+ const raul::Path& path,
const Properties& properties);
~CreateGraph() override;
@@ -69,12 +69,12 @@ public:
private:
void build_child_events();
- const Raul::Path _path;
+ const raul::Path _path;
Properties _properties;
ClientUpdate _update;
GraphImpl* _graph;
GraphImpl* _parent;
- Raul::managed_ptr<CompiledGraph> _compiled_graph;
+ raul::managed_ptr<CompiledGraph> _compiled_graph;
std::list<std::unique_ptr<Event>> _child_events;
};
diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp
index 2b0c00a5..71b37735 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -53,7 +53,7 @@ CreatePort::CreatePort(Engine& engine,
const std::shared_ptr<Interface>& client,
int32_t id,
SampleCount timestamp,
- const Raul::Path& path,
+ const raul::Path& path,
const Properties& properties)
: Event(engine, client, id, timestamp)
, _path(path)
@@ -107,7 +107,7 @@ CreatePort::pre_process(PreProcessContext&)
return Event::pre_process_done(Status::EXISTS, _path);
}
- const Raul::Path parent_path = _path.parent();
+ const raul::Path parent_path = _path.parent();
Node* const parent = _engine.store()->get(parent_path);
if (!parent) {
return Event::pre_process_done(Status::PARENT_NOT_FOUND, parent_path);
@@ -156,7 +156,7 @@ CreatePort::pre_process(PreProcessContext&)
}
// Create port
- _graph_port = new DuplexPort(bufs, _graph, Raul::Symbol(_path.symbol()),
+ _graph_port = new DuplexPort(bufs, _graph, raul::Symbol(_path.symbol()),
index,
polyphonic,
_port_type, _buf_type, buf_size,
diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp
index 196ca5b9..351f0159 100644
--- a/src/server/events/CreatePort.hpp
+++ b/src/server/events/CreatePort.hpp
@@ -58,7 +58,7 @@ public:
const std::shared_ptr<Interface>& client,
int32_t id,
SampleCount timestamp,
- const Raul::Path& path,
+ const raul::Path& path,
const Properties& properties);
bool pre_process(PreProcessContext& ctx) override;
@@ -72,12 +72,12 @@ private:
OUTPUT
};
- Raul::Path _path;
+ raul::Path _path;
PortType _port_type;
LV2_URID _buf_type;
GraphImpl* _graph;
DuplexPort* _graph_port;
- Raul::managed_ptr<BlockImpl::Ports> _ports_array; ///< New external port array for Graph
+ raul::managed_ptr<BlockImpl::Ports> _ports_array; ///< New external port array for Graph
EnginePort* _engine_port; ///< Driver port if on the root
Properties _properties;
Properties _update;
diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp
index cac28750..50a925b5 100644
--- a/src/server/events/Delete.hpp
+++ b/src/server/events/Delete.hpp
@@ -71,15 +71,15 @@ public:
private:
using IndexChange = std::pair<uint32_t, uint32_t>;
- using IndexChanges = std::map<Raul::Path, IndexChange>;
+ using IndexChanges = std::map<raul::Path, IndexChange>;
const ingen::Del _msg;
- Raul::Path _path;
+ raul::Path _path;
std::shared_ptr<BlockImpl> _block; ///< Non-null iff a block
std::shared_ptr<DuplexPort> _port; ///< Non-null iff a port
EnginePort* _engine_port;
- Raul::managed_ptr<GraphImpl::Ports> _ports_array; ///< New (external) ports for Graph
- Raul::managed_ptr<CompiledGraph> _compiled_graph; ///< Graph's new process order
+ raul::managed_ptr<GraphImpl::Ports> _ports_array; ///< New (external) ports for Graph
+ raul::managed_ptr<CompiledGraph> _compiled_graph; ///< Graph's new process order
std::unique_ptr<DisconnectAll> _disconnect_event;
Store::Objects _removed_objects;
IndexChanges _port_index_changes;
diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp
index e441f2fe..034b2194 100644
--- a/src/server/events/Delta.cpp
+++ b/src/server/events/Delta.cpp
@@ -240,7 +240,7 @@ Delta::pre_process(PreProcessContext& ctx)
}
if (is_graph_object && !_object) {
- Raul::Path path(uri_to_path(_subject));
+ raul::Path path(uri_to_path(_subject));
bool is_graph = false;
bool is_block = false;
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index f28832a2..726d8b48 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -117,7 +117,7 @@ private:
ClientUpdate _update;
ingen::Resource* _object;
GraphImpl* _graph;
- Raul::managed_ptr<CompiledGraph> _compiled_graph;
+ raul::managed_ptr<CompiledGraph> _compiled_graph;
ControlBindings::Binding* _binding;
StatePtr _state;
Resource::Graph _context;
diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp
index 7f8a1594..a835ed27 100644
--- a/src/server/events/Disconnect.hpp
+++ b/src/server/events/Disconnect.hpp
@@ -75,14 +75,14 @@ public:
PortImpl* _tail;
InputPort* _head;
std::shared_ptr<ArcImpl> _arc;
- Raul::managed_ptr<PortImpl::Voices> _voices;
+ raul::managed_ptr<PortImpl::Voices> _voices;
};
private:
const ingen::Disconnect _msg;
GraphImpl* _graph;
std::unique_ptr<Impl> _impl;
- Raul::managed_ptr<CompiledGraph> _compiled_graph;
+ raul::managed_ptr<CompiledGraph> _compiled_graph;
};
} // namespace events
diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp
index 4560fe85..a527dc34 100644
--- a/src/server/events/DisconnectAll.hpp
+++ b/src/server/events/DisconnectAll.hpp
@@ -75,7 +75,7 @@ private:
BlockImpl* _block;
PortImpl* _port;
Impls _impls;
- Raul::managed_ptr<CompiledGraph> _compiled_graph;
+ raul::managed_ptr<CompiledGraph> _compiled_graph;
bool _deleting;
};
diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp
index e651b1e7..7ebab080 100644
--- a/src/server/events/Mark.hpp
+++ b/src/server/events/Mark.hpp
@@ -74,7 +74,7 @@ private:
enum class Type { BUNDLE_BEGIN, BUNDLE_END };
using CompiledGraphs =
- std::map<GraphImpl*, Raul::managed_ptr<CompiledGraph>>;
+ std::map<GraphImpl*, raul::managed_ptr<CompiledGraph>>;
CompiledGraphs _compiled_graphs;
Type _type;