diff options
author | David Robillard <d@drobilla.net> | 2020-08-02 15:23:19 +0200 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2020-08-02 15:23:19 +0200 |
commit | bdbdf42f3fe990c713c5437724db39274c387eee (patch) | |
tree | 7f921a04fd580da6bcb6fc8975fa2aebfcd93e0f /src/server/events | |
parent | ec0b87a18623c17c16f6a648fcf277abe14142b7 (diff) | |
download | ingen-bdbdf42f3fe990c713c5437724db39274c387eee.tar.gz ingen-bdbdf42f3fe990c713c5437724db39274c387eee.tar.bz2 ingen-bdbdf42f3fe990c713c5437724db39274c387eee.zip |
Remove std::shared_ptr alias
Diffstat (limited to 'src/server/events')
28 files changed, 270 insertions, 229 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index b269ca45..444bd4b7 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -39,15 +39,16 @@ namespace ingen { namespace server { namespace events { -Connect::Connect(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Connect& msg) - : Event(engine, client, msg.seq, timestamp) - , _msg(msg) - , _graph(nullptr) - , _head(nullptr) -{} +Connect::Connect(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Connect& msg) + : Event(engine, client, msg.seq, timestamp) + , _msg(msg) + , _graph(nullptr) + , _head(nullptr) +{ +} bool Connect::pre_process(PreProcessContext& ctx) diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index 305ad7a8..217860ac 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -22,6 +22,10 @@ #include "PortImpl.hpp" #include "types.hpp" +#include "ingen/memory.hpp" + +#include <memory> + namespace ingen { namespace server { @@ -38,10 +42,10 @@ namespace events { class Connect : public Event { public: - Connect(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Connect& msg); + Connect(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Connect& msg); bool pre_process(PreProcessContext& ctx) override; void execute(RunContext& ctx) override; @@ -49,16 +53,16 @@ public: void undo(Interface& target) override; private: - const ingen::Connect _msg; - GraphImpl* _graph; - InputPort* _head; - MPtr<CompiledGraph> _compiled_graph; - SPtr<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; + 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; }; } // namespace events diff --git a/src/server/events/Copy.cpp b/src/server/events/Copy.cpp index dbe57dc0..d57849b2 100644 --- a/src/server/events/Copy.cpp +++ b/src/server/events/Copy.cpp @@ -37,15 +37,15 @@ namespace ingen { namespace server { namespace events { -Copy::Copy(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Copy& msg) - : Event(engine, client, msg.seq, timestamp) - , _msg(msg) - , _old_block(nullptr) - , _parent(nullptr) - , _block(nullptr) +Copy::Copy(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Copy& msg) + : Event(engine, client, msg.seq, timestamp) + , _msg(msg) + , _old_block(nullptr) + , _parent(nullptr) + , _block(nullptr) {} bool diff --git a/src/server/events/Copy.hpp b/src/server/events/Copy.hpp index aa1eae5d..fb788873 100644 --- a/src/server/events/Copy.hpp +++ b/src/server/events/Copy.hpp @@ -20,6 +20,10 @@ #include "CompiledGraph.hpp" #include "Event.hpp" +#include "ingen/memory.hpp" + +#include <memory> + namespace ingen { namespace server { @@ -35,10 +39,10 @@ namespace events { class Copy : public Event { public: - Copy(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Copy& msg); + Copy(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Copy& msg); bool pre_process(PreProcessContext& ctx) override; void execute(RunContext& ctx) override; @@ -50,11 +54,11 @@ private: bool engine_to_filesystem(PreProcessContext& ctx); bool filesystem_to_engine(PreProcessContext& ctx); - const ingen::Copy _msg; - SPtr<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; + MPtr<CompiledGraph> _compiled_graph; }; } // namespace events diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index 4b48cfde..c443645a 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -32,23 +32,24 @@ #include "raul/Maid.hpp" #include "raul/Path.hpp" +#include <memory> #include <utility> namespace ingen { namespace server { namespace events { -CreateBlock::CreateBlock(Engine& engine, - const SPtr<Interface>& client, - int32_t id, - SampleCount timestamp, - const Raul::Path& path, - Properties& properties) - : Event(engine, client, id, timestamp) - , _path(path) - , _properties(properties) - , _graph(nullptr) - , _block(nullptr) +CreateBlock::CreateBlock(Engine& engine, + const std::shared_ptr<Interface>& client, + int32_t id, + SampleCount timestamp, + const Raul::Path& path, + Properties& properties) + : Event(engine, client, id, timestamp) + , _path(path) + , _properties(properties) + , _graph(nullptr) + , _block(nullptr) {} bool @@ -56,8 +57,8 @@ CreateBlock::pre_process(PreProcessContext& ctx) { using iterator = Properties::const_iterator; - const ingen::URIs& uris = _engine.world().uris(); - const SPtr<Store> store = _engine.store(); + const ingen::URIs& uris = _engine.world().uris(); + const std::shared_ptr<Store> store = _engine.store(); // Check sanity of target path if (_path.is_root()) { diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp index a9f43a80..dc2efa58 100644 --- a/src/server/events/CreateBlock.hpp +++ b/src/server/events/CreateBlock.hpp @@ -21,7 +21,10 @@ #include "CompiledGraph.hpp" #include "Event.hpp" +#include "ingen/memory.hpp" + #include <cstdint> +#include <memory> namespace ingen { namespace server { @@ -38,12 +41,12 @@ namespace events { class CreateBlock : public Event { public: - CreateBlock(Engine& engine, - const SPtr<Interface>& client, - int32_t id, - SampleCount timestamp, - const Raul::Path& path, - Properties& properties); + CreateBlock(Engine& engine, + const std::shared_ptr<Interface>& client, + int32_t id, + SampleCount timestamp, + const Raul::Path& path, + Properties& properties); bool pre_process(PreProcessContext& ctx) override; void execute(RunContext& ctx) override; diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index 7a1d9a75..1b04482f 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -26,26 +26,28 @@ #include "ingen/Store.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" +#include "ingen/memory.hpp" #include "raul/Maid.hpp" #include "raul/Path.hpp" +#include <memory> #include <utility> namespace ingen { namespace server { namespace events { -CreateGraph::CreateGraph(Engine& engine, - const SPtr<Interface>& client, - int32_t id, - SampleCount timestamp, - const Raul::Path& path, - const Properties& properties) - : Event(engine, client, id, timestamp) - , _path(path) - , _properties(properties) - , _graph(nullptr) - , _parent(nullptr) +CreateGraph::CreateGraph(Engine& engine, + const std::shared_ptr<Interface>& client, + int32_t id, + SampleCount timestamp, + const Raul::Path& path, + const Properties& properties) + : Event(engine, client, id, timestamp) + , _path(path) + , _properties(properties) + , _graph(nullptr) + , _parent(nullptr) {} void diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp index 7fbf9bdc..ea24891d 100644 --- a/src/server/events/CreateGraph.hpp +++ b/src/server/events/CreateGraph.hpp @@ -41,12 +41,12 @@ namespace events { class CreateGraph : public Event { public: - CreateGraph(Engine& engine, - const SPtr<Interface>& client, - int32_t id, - SampleCount timestamp, - const Raul::Path& path, - const Properties& properties); + CreateGraph(Engine& engine, + const std::shared_ptr<Interface>& client, + int32_t id, + SampleCount timestamp, + const Raul::Path& path, + const Properties& properties); bool pre_process(PreProcessContext& ctx) override; void execute(RunContext& ctx) override; diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index 2520378c..2cf66386 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -30,30 +30,32 @@ #include "ingen/URIMap.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" +#include "ingen/memory.hpp" #include "raul/Array.hpp" #include "raul/Path.hpp" #include <cassert> +#include <memory> #include <utility> namespace ingen { namespace server { namespace events { -CreatePort::CreatePort(Engine& engine, - const SPtr<Interface>& client, - int32_t id, - SampleCount timestamp, - const Raul::Path& path, - const Properties& properties) - : Event(engine, client, id, timestamp) - , _path(path) - , _port_type(PortType::UNKNOWN) - , _buf_type(0) - , _graph(nullptr) - , _graph_port(nullptr) - , _engine_port(nullptr) - , _properties(properties) +CreatePort::CreatePort(Engine& engine, + const std::shared_ptr<Interface>& client, + int32_t id, + SampleCount timestamp, + const Raul::Path& path, + const Properties& properties) + : Event(engine, client, id, timestamp) + , _path(path) + , _port_type(PortType::UNKNOWN) + , _buf_type(0) + , _graph(nullptr) + , _graph_port(nullptr) + , _engine_port(nullptr) + , _properties(properties) { const ingen::URIs& uris = _engine.world().uris(); diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index 9ad8987a..c0f57655 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -21,12 +21,14 @@ #include "Event.hpp" #include "PortType.hpp" +#include "ingen/memory.hpp" #include "lv2/urid/urid.h" #include "raul/Path.hpp" #include <boost/optional/optional.hpp> #include <cstdint> +#include <memory> namespace ingen { namespace server { @@ -44,12 +46,12 @@ namespace events { class CreatePort : public Event { public: - CreatePort(Engine& engine, - const SPtr<Interface>& client, - int32_t id, - SampleCount timestamp, - const Raul::Path& path, - const Properties& properties); + CreatePort(Engine& engine, + const std::shared_ptr<Interface>& client, + int32_t id, + SampleCount timestamp, + const Raul::Path& path, + const Properties& properties); bool pre_process(PreProcessContext& ctx) override; void execute(RunContext& ctx) override; diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index d0a77a31..fb5035ec 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -31,6 +31,7 @@ #include "ingen/Forge.hpp" #include "ingen/Store.hpp" #include "ingen/World.hpp" +#include "ingen/memory.hpp" #include "raul/Maid.hpp" #include "raul/Path.hpp" @@ -44,10 +45,10 @@ namespace ingen { namespace server { namespace events { -Delete::Delete(Engine& engine, - const SPtr<Interface>& client, - FrameTime timestamp, - const ingen::Del& msg) +Delete::Delete(Engine& engine, + const std::shared_ptr<Interface>& client, + FrameTime timestamp, + const ingen::Del& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) , _engine_port(nullptr) diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index c556bbd9..bda7a784 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -22,6 +22,7 @@ #include "GraphImpl.hpp" #include "ingen/Store.hpp" +#include "ingen/memory.hpp" #include <cstdint> #include <map> @@ -46,10 +47,10 @@ class DisconnectAll; class Delete : public Event { public: - Delete(Engine& engine, - const SPtr<Interface>& client, - FrameTime timestamp, - const ingen::Del& msg); + Delete(Engine& engine, + const std::shared_ptr<Interface>& client, + FrameTime timestamp, + const ingen::Del& msg); ~Delete() override; @@ -64,8 +65,8 @@ private: const ingen::Del _msg; Raul::Path _path; - SPtr<BlockImpl> _block; ///< Non-null iff a block - SPtr<DuplexPort> _port; ///< Non-null iff a port + 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 diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 2dc9e22b..04b30630 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -33,8 +33,10 @@ #include "ingen/Store.hpp" #include "ingen/URIs.hpp" #include "ingen/World.hpp" +#include "ingen/memory.hpp" #include "raul/Maid.hpp" +#include <memory> #include <mutex> #include <set> #include <string> @@ -48,10 +50,10 @@ class PreProcessContext; namespace events { -Delta::Delta(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Put& msg) +Delta::Delta(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Put& msg) : Event(engine, client, msg.seq, timestamp) , _create_event(nullptr) , _subject(msg.uri) @@ -67,10 +69,10 @@ Delta::Delta(Engine& engine, init(); } -Delta::Delta(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Delta& msg) +Delta::Delta(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Delta& msg) : Event(engine, client, msg.seq, timestamp) , _create_event(nullptr) , _subject(msg.uri) @@ -87,10 +89,10 @@ Delta::Delta(Engine& engine, init(); } -Delta::Delta(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::SetProperty& msg) +Delta::Delta(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::SetProperty& msg) : Event(engine, client, msg.seq, timestamp) , _subject(msg.subject) , _properties{{msg.predicate, msg.value}} diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index c4199262..40c3cc27 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -21,6 +21,7 @@ #include "ControlBindings.hpp" #include "Event.hpp" +#include "ingen/memory.hpp" #include "lilv/lilv.h" #include <boost/optional/optional.hpp> @@ -48,20 +49,20 @@ class SetPortValue; class Delta : public Event { public: - Delta(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Put& msg); + Delta(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Put& msg); - Delta(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Delta& msg); + Delta(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Delta& msg); - Delta(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::SetProperty& msg); + Delta(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::SetProperty& msg); ~Delta() override = default; @@ -78,11 +79,7 @@ public: Execution get_execution() const override; private: - enum class Type { - SET, - PUT, - PATCH - }; + enum class Type { SET, PUT, PATCH }; enum class SpecialType { NONE, diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index 3df5fd64..4918e5bf 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -29,6 +29,7 @@ #include "ThreadManager.hpp" #include "ingen/Store.hpp" +#include "ingen/memory.hpp" #include "raul/Maid.hpp" #include "raul/Path.hpp" @@ -43,10 +44,10 @@ namespace ingen { namespace server { namespace events { -Disconnect::Disconnect(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Disconnect& msg) +Disconnect::Disconnect(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Disconnect& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) , _graph(nullptr) diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index d6a455c8..8b43d0d0 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -20,6 +20,7 @@ #include "CompiledGraph.hpp" #include "Event.hpp" #include "PortImpl.hpp" +#include "ingen/memory.hpp" #include "types.hpp" #include <memory> @@ -39,10 +40,10 @@ namespace events { class Disconnect : public Event { public: - Disconnect(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Disconnect& msg); + Disconnect(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Disconnect& msg); bool pre_process(PreProcessContext& ctx) override; void execute(RunContext& ctx) override; @@ -59,11 +60,11 @@ public: inline InputPort* head() { return _head; } private: - Engine& _engine; - PortImpl* _tail; - InputPort* _head; - SPtr<ArcImpl> _arc; - MPtr<PortImpl::Voices> _voices; + Engine& _engine; + PortImpl* _tail; + InputPort* _head; + std::shared_ptr<ArcImpl> _arc; + MPtr<PortImpl::Voices> _voices; }; private: diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index cc4284ff..47f8092a 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -32,6 +32,7 @@ #include "raul/Maid.hpp" #include "raul/Path.hpp" +#include <memory> #include <mutex> #include <set> #include <utility> @@ -40,16 +41,16 @@ namespace ingen { namespace server { namespace events { -DisconnectAll::DisconnectAll(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::DisconnectAll& msg) - : Event(engine, client, msg.seq, timestamp) - , _msg(msg) - , _parent(nullptr) - , _block(nullptr) - , _port(nullptr) - , _deleting(false) +DisconnectAll::DisconnectAll(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::DisconnectAll& msg) + : Event(engine, client, msg.seq, timestamp) + , _msg(msg) + , _parent(nullptr) + , _block(nullptr) + , _port(nullptr) + , _deleting(false) { } diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index 09d1165f..9080d3e7 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -21,9 +21,11 @@ #include "Disconnect.hpp" #include "Event.hpp" +#include "ingen/memory.hpp" #include "raul/Path.hpp" #include <list> +#include <memory> namespace ingen { namespace server { @@ -43,10 +45,10 @@ class Disconnect; class DisconnectAll : public Event { public: - DisconnectAll(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::DisconnectAll& msg); + DisconnectAll(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::DisconnectAll& msg); DisconnectAll(Engine& engine, GraphImpl* parent, diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index 9194226d..1399fd6d 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -31,16 +31,17 @@ #include "ingen/World.hpp" #include <cstdint> +#include <memory> #include <mutex> namespace ingen { namespace server { namespace events { -Get::Get(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Get& msg) +Get::Get(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Get& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) , _object(nullptr) diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index 0c3d053d..2ccb88e3 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -22,6 +22,8 @@ #include "Event.hpp" #include "types.hpp" +#include <memory> + namespace ingen { namespace server { @@ -39,10 +41,10 @@ namespace events { class Get : public Event { public: - Get(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Get& msg); + Get(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Get& msg); bool pre_process(PreProcessContext& ctx) override; void execute(RunContext&) override; diff --git a/src/server/events/Mark.cpp b/src/server/events/Mark.cpp index d7eb1804..8db6335c 100644 --- a/src/server/events/Mark.cpp +++ b/src/server/events/Mark.cpp @@ -20,6 +20,8 @@ #include "PreProcessContext.hpp" #include "UndoStack.hpp" +#include "ingen/memory.hpp" + #include <memory> #include <utility> @@ -27,19 +29,19 @@ namespace ingen { namespace server { namespace events { -Mark::Mark(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::BundleBegin& msg) +Mark::Mark(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::BundleBegin& msg) : Event(engine, client, msg.seq, timestamp) , _type(Type::BUNDLE_BEGIN) , _depth(-1) {} -Mark::Mark(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::BundleEnd& msg) +Mark::Mark(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::BundleEnd& msg) : Event(engine, client, msg.seq, timestamp) , _type(Type::BUNDLE_END) , _depth(-1) diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp index 2bcdafb2..b6279f0c 100644 --- a/src/server/events/Mark.hpp +++ b/src/server/events/Mark.hpp @@ -19,7 +19,10 @@ #include "Event.hpp" +#include "ingen/memory.hpp" + #include <map> +#include <memory> namespace ingen { namespace server { @@ -40,15 +43,15 @@ namespace events { class Mark : public Event { public: - Mark(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::BundleBegin& msg); - - Mark(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::BundleEnd& msg); + Mark(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::BundleBegin& msg); + + Mark(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::BundleEnd& msg); void mark(PreProcessContext& ctx) override; bool pre_process(PreProcessContext& ctx) override; diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index d7262143..13d92ef2 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -25,16 +25,17 @@ #include "GraphImpl.hpp" #include "events/Move.hpp" +#include <memory> #include <mutex> namespace ingen { namespace server { namespace events { -Move::Move(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Move& msg) +Move::Move(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Move& msg) : Event(engine, client, msg.seq, timestamp) , _msg(msg) { diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp index 5c71ce96..7037388f 100644 --- a/src/server/events/Move.hpp +++ b/src/server/events/Move.hpp @@ -22,6 +22,8 @@ #include "ingen/Store.hpp" #include "raul/Path.hpp" +#include <memory> + namespace ingen { namespace server { @@ -36,10 +38,10 @@ namespace events { class Move : public Event { public: - Move(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Move& msg); + Move(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Move& msg); bool pre_process(PreProcessContext& ctx) override; void execute(RunContext& ctx) override; diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index 66511a0c..c8c60e04 100644 --- a/src/server/events/SetPortValue.cpp +++ b/src/server/events/SetPortValue.cpp @@ -31,20 +31,21 @@ #include "ingen/World.hpp" #include <cassert> +#include <memory> namespace ingen { namespace server { namespace events { /** Internal */ -SetPortValue::SetPortValue(Engine& engine, - const SPtr<Interface>& client, - int32_t id, - SampleCount timestamp, - PortImpl* port, - const Atom& value, - bool activity, - bool synthetic) +SetPortValue::SetPortValue(Engine& engine, + const std::shared_ptr<Interface>& client, + int32_t id, + SampleCount timestamp, + PortImpl* port, + const Atom& value, + bool activity, + bool synthetic) : Event(engine, client, id, timestamp) , _port(port) , _value(value) diff --git a/src/server/events/SetPortValue.hpp b/src/server/events/SetPortValue.hpp index df30d514..576b01a0 100644 --- a/src/server/events/SetPortValue.hpp +++ b/src/server/events/SetPortValue.hpp @@ -25,6 +25,7 @@ #include "ingen/Atom.hpp" #include <cstdint> +#include <memory> namespace ingen { namespace server { @@ -40,14 +41,14 @@ namespace events { class SetPortValue : public Event { public: - SetPortValue(Engine& engine, - const SPtr<Interface>& client, - int32_t id, - SampleCount timestamp, - PortImpl* port, - const Atom& value, - bool activity, - bool synthetic = false); + SetPortValue(Engine& engine, + const std::shared_ptr<Interface>& client, + int32_t id, + SampleCount timestamp, + PortImpl* port, + const Atom& value, + bool activity, + bool synthetic = false); bool pre_process(PreProcessContext& ctx) override; void execute(RunContext& ctx) override; diff --git a/src/server/events/Undo.cpp b/src/server/events/Undo.cpp index c855dbfb..22695415 100644 --- a/src/server/events/Undo.cpp +++ b/src/server/events/Undo.cpp @@ -22,23 +22,24 @@ #include "ingen/AtomReader.hpp" #include <deque> +#include <memory> namespace ingen { namespace server { namespace events { -Undo::Undo(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Undo& msg) +Undo::Undo(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Undo& msg) : Event(engine, client, msg.seq, timestamp) , _is_redo(false) {} -Undo::Undo(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Redo& msg) +Undo::Undo(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Redo& msg) : Event(engine, client, msg.seq, timestamp) , _is_redo(true) {} diff --git a/src/server/events/Undo.hpp b/src/server/events/Undo.hpp index 1fdaa4dd..7be79a39 100644 --- a/src/server/events/Undo.hpp +++ b/src/server/events/Undo.hpp @@ -21,6 +21,8 @@ #include "UndoStack.hpp" #include "types.hpp" +#include <memory> + namespace ingen { namespace server { namespace events { @@ -32,15 +34,15 @@ namespace events { class Undo : public Event { public: - Undo(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Undo& msg); - - Undo(Engine& engine, - const SPtr<Interface>& client, - SampleCount timestamp, - const ingen::Redo& msg); + Undo(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Undo& msg); + + Undo(Engine& engine, + const std::shared_ptr<Interface>& client, + SampleCount timestamp, + const ingen::Redo& msg); bool pre_process(PreProcessContext& ctx) override; void execute(RunContext& ctx) override; |