summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/Connect.hpp22
-rw-r--r--src/server/events/Copy.hpp12
-rw-r--r--src/server/events/CreateBlock.hpp14
-rw-r--r--src/server/events/CreateGraph.hpp4
-rw-r--r--src/server/events/CreatePort.cpp4
-rw-r--r--src/server/events/CreatePort.hpp22
-rw-r--r--src/server/events/Delete.hpp22
-rw-r--r--src/server/events/Delta.hpp32
-rw-r--r--src/server/events/Disconnect.hpp21
-rw-r--r--src/server/events/DisconnectAll.hpp16
-rw-r--r--src/server/events/Mark.cpp4
-rw-r--r--src/server/events/Mark.hpp5
12 files changed, 89 insertions, 89 deletions
diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp
index 217860ac..80b8563c 100644
--- a/src/server/events/Connect.hpp
+++ b/src/server/events/Connect.hpp
@@ -22,7 +22,7 @@
#include "PortImpl.hpp"
#include "types.hpp"
-#include "ingen/memory.hpp"
+#include "raul/Maid.hpp"
#include <memory>
@@ -53,16 +53,16 @@ public:
void undo(Interface& target) override;
private:
- const ingen::Connect _msg;
- GraphImpl* _graph;
- InputPort* _head;
- MPtr<CompiledGraph> _compiled_graph;
- std::shared_ptr<ArcImpl> _arc;
- MPtr<PortImpl::Voices> _voices;
- Properties _tail_remove;
- Properties _tail_add;
- Properties _head_remove;
- Properties _head_add;
+ const ingen::Connect _msg;
+ GraphImpl* _graph;
+ InputPort* _head;
+ Raul::managed_ptr<CompiledGraph> _compiled_graph;
+ std::shared_ptr<ArcImpl> _arc;
+ Raul::managed_ptr<PortImpl::Voices> _voices;
+ Properties _tail_remove;
+ Properties _tail_add;
+ Properties _head_remove;
+ Properties _head_add;
};
} // namespace events
diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp
index fb788873..dbe6a29b 100644
--- a/src/server/events/Copy.hpp
+++ b/src/server/events/Copy.hpp
@@ -20,7 +20,7 @@
#include "CompiledGraph.hpp"
#include "Event.hpp"
-#include "ingen/memory.hpp"
+#include "raul/Maid.hpp"
#include <memory>
@@ -54,11 +54,11 @@ private:
bool engine_to_filesystem(PreProcessContext& ctx);
bool filesystem_to_engine(PreProcessContext& ctx);
- const ingen::Copy _msg;
- std::shared_ptr<BlockImpl> _old_block;
- GraphImpl* _parent;
- BlockImpl* _block;
- MPtr<CompiledGraph> _compiled_graph;
+ const ingen::Copy _msg;
+ std::shared_ptr<BlockImpl> _old_block;
+ GraphImpl* _parent;
+ BlockImpl* _block;
+ Raul::managed_ptr<CompiledGraph> _compiled_graph;
};
} // namespace events
diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp
index dc2efa58..91ccee1b 100644
--- a/src/server/events/CreateBlock.hpp
+++ b/src/server/events/CreateBlock.hpp
@@ -21,7 +21,7 @@
#include "CompiledGraph.hpp"
#include "Event.hpp"
-#include "ingen/memory.hpp"
+#include "raul/Maid.hpp"
#include <cstdint>
#include <memory>
@@ -54,12 +54,12 @@ public:
void undo(Interface& target) override;
private:
- Raul::Path _path;
- Properties& _properties;
- ClientUpdate _update;
- GraphImpl* _graph;
- BlockImpl* _block;
- MPtr<CompiledGraph> _compiled_graph;
+ Raul::Path _path;
+ Properties& _properties;
+ ClientUpdate _update;
+ GraphImpl* _graph;
+ BlockImpl* _block;
+ Raul::managed_ptr<CompiledGraph> _compiled_graph;
};
} // namespace events
diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp
index ea24891d..0643d8be 100644
--- a/src/server/events/CreateGraph.hpp
+++ b/src/server/events/CreateGraph.hpp
@@ -21,7 +21,7 @@
#include "CompiledGraph.hpp"
#include "Event.hpp"
-#include "ingen/memory.hpp"
+#include "raul/Maid.hpp"
#include <cstdint>
#include <list>
@@ -63,7 +63,7 @@ private:
ClientUpdate _update;
GraphImpl* _graph;
GraphImpl* _parent;
- MPtr<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 2cf66386..d164b541 100644
--- a/src/server/events/CreatePort.cpp
+++ b/src/server/events/CreatePort.cpp
@@ -30,8 +30,8 @@
#include "ingen/URIMap.hpp"
#include "ingen/URIs.hpp"
#include "ingen/World.hpp"
-#include "ingen/memory.hpp"
#include "raul/Array.hpp"
+#include "raul/Maid.hpp"
#include "raul/Path.hpp"
#include <cassert>
@@ -185,7 +185,7 @@ void
CreatePort::execute(RunContext& ctx)
{
if (_status == Status::SUCCESS) {
- const MPtr<GraphImpl::Ports>& old_ports = _graph->external_ports();
+ const auto& old_ports = _graph->external_ports();
if (old_ports) {
for (uint32_t i = 0; i < old_ports->size(); ++i) {
const auto* const old_port = (*old_ports)[i];
diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp
index c0f57655..f1b278d5 100644
--- a/src/server/events/CreatePort.hpp
+++ b/src/server/events/CreatePort.hpp
@@ -21,8 +21,8 @@
#include "Event.hpp"
#include "PortType.hpp"
-#include "ingen/memory.hpp"
#include "lv2/urid/urid.h"
+#include "raul/Maid.hpp"
#include "raul/Path.hpp"
#include <boost/optional/optional.hpp>
@@ -64,16 +64,16 @@ private:
OUTPUT
};
- Raul::Path _path;
- PortType _port_type;
- LV2_URID _buf_type;
- GraphImpl* _graph;
- DuplexPort* _graph_port;
- MPtr<BlockImpl::Ports> _ports_array; ///< New external port array for Graph
- EnginePort* _engine_port; ///< Driver port if on the root
- Properties _properties;
- Properties _update;
- boost::optional<Flow> _flow;
+ 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
+ EnginePort* _engine_port; ///< Driver port if on the root
+ Properties _properties;
+ Properties _update;
+ boost::optional<Flow> _flow;
};
} // namespace events
diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp
index bda7a784..40972d42 100644
--- a/src/server/events/Delete.hpp
+++ b/src/server/events/Delete.hpp
@@ -22,7 +22,7 @@
#include "GraphImpl.hpp"
#include "ingen/Store.hpp"
-#include "ingen/memory.hpp"
+#include "raul/Maid.hpp"
#include <cstdint>
#include <map>
@@ -63,16 +63,16 @@ private:
using IndexChange = std::pair<uint32_t, uint32_t>;
using IndexChanges = std::map<Raul::Path, IndexChange>;
- const ingen::Del _msg;
- 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;
- MPtr<GraphImpl::Ports> _ports_array; ///< New (external) ports for Graph
- MPtr<CompiledGraph> _compiled_graph; ///< Graph's new process order
- std::unique_ptr<DisconnectAll> _disconnect_event;
- Store::Objects _removed_objects;
- IndexChanges _port_index_changes;
+ const ingen::Del _msg;
+ 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
+ std::unique_ptr<DisconnectAll> _disconnect_event;
+ Store::Objects _removed_objects;
+ IndexChanges _port_index_changes;
std::vector<ControlBindings::Binding*> _removed_bindings;
};
diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp
index 40c3cc27..1a7c2005 100644
--- a/src/server/events/Delta.hpp
+++ b/src/server/events/Delta.hpp
@@ -21,8 +21,8 @@
#include "ControlBindings.hpp"
#include "Event.hpp"
-#include "ingen/memory.hpp"
#include "lilv/lilv.h"
+#include "raul/Maid.hpp"
#include <boost/optional/optional.hpp>
@@ -97,21 +97,21 @@ private:
void init();
- std::unique_ptr<Event> _create_event;
- SetEvents _set_events;
- std::vector<SpecialType> _types;
- std::vector<SpecialType> _remove_types;
- URI _subject;
- Properties _properties;
- Properties _remove;
- ClientUpdate _update;
- ingen::Resource* _object;
- GraphImpl* _graph;
- MPtr<CompiledGraph> _compiled_graph;
- ControlBindings::Binding* _binding;
- LilvState* _state;
- Resource::Graph _context;
- Type _type;
+ std::unique_ptr<Event> _create_event;
+ SetEvents _set_events;
+ std::vector<SpecialType> _types;
+ std::vector<SpecialType> _remove_types;
+ URI _subject;
+ Properties _properties;
+ Properties _remove;
+ ClientUpdate _update;
+ ingen::Resource* _object;
+ GraphImpl* _graph;
+ Raul::managed_ptr<CompiledGraph> _compiled_graph;
+ ControlBindings::Binding* _binding;
+ LilvState* _state;
+ Resource::Graph _context;
+ Type _type;
Properties _added;
Properties _removed;
diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp
index 8b43d0d0..c4cd32c4 100644
--- a/src/server/events/Disconnect.hpp
+++ b/src/server/events/Disconnect.hpp
@@ -20,9 +20,10 @@
#include "CompiledGraph.hpp"
#include "Event.hpp"
#include "PortImpl.hpp"
-#include "ingen/memory.hpp"
#include "types.hpp"
+#include "raul/Maid.hpp"
+
#include <memory>
namespace ingen {
@@ -60,18 +61,18 @@ public:
inline InputPort* head() { return _head; }
private:
- Engine& _engine;
- PortImpl* _tail;
- InputPort* _head;
- std::shared_ptr<ArcImpl> _arc;
- MPtr<PortImpl::Voices> _voices;
+ Engine& _engine;
+ PortImpl* _tail;
+ InputPort* _head;
+ std::shared_ptr<ArcImpl> _arc;
+ Raul::managed_ptr<PortImpl::Voices> _voices;
};
private:
- const ingen::Disconnect _msg;
- GraphImpl* _graph;
- std::unique_ptr<Impl> _impl;
- MPtr<CompiledGraph> _compiled_graph;
+ const ingen::Disconnect _msg;
+ GraphImpl* _graph;
+ std::unique_ptr<Impl> _impl;
+ Raul::managed_ptr<CompiledGraph> _compiled_graph;
};
} // namespace events
diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp
index 9080d3e7..2b5bc589 100644
--- a/src/server/events/DisconnectAll.hpp
+++ b/src/server/events/DisconnectAll.hpp
@@ -21,7 +21,7 @@
#include "Disconnect.hpp"
#include "Event.hpp"
-#include "ingen/memory.hpp"
+#include "raul/Maid.hpp"
#include "raul/Path.hpp"
#include <list>
@@ -64,13 +64,13 @@ public:
private:
using Impls = std::list<Disconnect::Impl*>;
- const ingen::DisconnectAll _msg;
- GraphImpl* _parent;
- BlockImpl* _block;
- PortImpl* _port;
- Impls _impls;
- MPtr<CompiledGraph> _compiled_graph;
- bool _deleting;
+ const ingen::DisconnectAll _msg;
+ GraphImpl* _parent;
+ BlockImpl* _block;
+ PortImpl* _port;
+ Impls _impls;
+ Raul::managed_ptr<CompiledGraph> _compiled_graph;
+ bool _deleting;
};
} // namespace events
diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp
index 8db6335c..5006c035 100644
--- a/src/server/events/Mark.cpp
+++ b/src/server/events/Mark.cpp
@@ -20,8 +20,6 @@
#include "PreProcessContext.hpp"
#include "UndoStack.hpp"
-#include "ingen/memory.hpp"
-
#include <memory>
#include <utility>
@@ -79,7 +77,7 @@ Mark::pre_process(PreProcessContext& ctx)
ctx.set_in_bundle(false);
if (!ctx.dirty_graphs().empty()) {
for (GraphImpl* g : ctx.dirty_graphs()) {
- MPtr<CompiledGraph> cg = compile(*_engine.maid(), *g);
+ auto cg = compile(*_engine.maid(), *g);
if (cg) {
_compiled_graphs.emplace(g, std::move(cg));
}
diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp
index b6279f0c..46587b76 100644
--- a/src/server/events/Mark.hpp
+++ b/src/server/events/Mark.hpp
@@ -19,7 +19,7 @@
#include "Event.hpp"
-#include "ingen/memory.hpp"
+#include "raul/Maid.hpp"
#include <map>
#include <memory>
@@ -63,7 +63,8 @@ public:
private:
enum class Type { BUNDLE_BEGIN, BUNDLE_END };
- using CompiledGraphs = std::map<GraphImpl*, MPtr<CompiledGraph>>;
+ using CompiledGraphs =
+ std::map<GraphImpl*, Raul::managed_ptr<CompiledGraph>>;
CompiledGraphs _compiled_graphs;
Type _type;
generated by cgit v1.2.1 (git 2.18.0) at 2025-02-01 20:52:48 +0000