diff options
Diffstat (limited to 'src/server/events')
-rw-r--r-- | src/server/events/Connect.cpp | 14 | ||||
-rw-r--r-- | src/server/events/Connect.hpp | 14 | ||||
-rw-r--r-- | src/server/events/CreateBlock.cpp | 2 | ||||
-rw-r--r-- | src/server/events/CreateBlock.hpp | 2 | ||||
-rw-r--r-- | src/server/events/CreateGraph.cpp | 2 | ||||
-rw-r--r-- | src/server/events/CreateGraph.hpp | 2 | ||||
-rw-r--r-- | src/server/events/CreatePort.cpp | 2 | ||||
-rw-r--r-- | src/server/events/CreatePort.hpp | 2 | ||||
-rw-r--r-- | src/server/events/Delete.cpp | 14 | ||||
-rw-r--r-- | src/server/events/Delete.hpp | 32 | ||||
-rw-r--r-- | src/server/events/Delta.cpp | 18 | ||||
-rw-r--r-- | src/server/events/Delta.hpp | 4 | ||||
-rw-r--r-- | src/server/events/Disconnect.cpp | 12 | ||||
-rw-r--r-- | src/server/events/Disconnect.hpp | 14 | ||||
-rw-r--r-- | src/server/events/DisconnectAll.cpp | 12 | ||||
-rw-r--r-- | src/server/events/DisconnectAll.hpp | 12 | ||||
-rw-r--r-- | src/server/events/Get.cpp | 10 | ||||
-rw-r--r-- | src/server/events/Get.hpp | 10 | ||||
-rw-r--r-- | src/server/events/Move.cpp | 12 | ||||
-rw-r--r-- | src/server/events/Move.hpp | 12 | ||||
-rw-r--r-- | src/server/events/SetPortValue.cpp | 12 | ||||
-rw-r--r-- | src/server/events/SetPortValue.hpp | 12 |
22 files changed, 113 insertions, 113 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp index cbdb67c5..4c4a3974 100644 --- a/src/server/events/Connect.cpp +++ b/src/server/events/Connect.cpp @@ -34,12 +34,12 @@ namespace Ingen { namespace Server { namespace Events { -Connect::Connect(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - const Raul::Path& tail_path, - const Raul::Path& head_path) +Connect::Connect(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + const Raul::Path& tail_path, + const Raul::Path& head_path) : Event(engine, client, id, timestamp) , _tail_path(tail_path) , _head_path(head_path) @@ -106,7 +106,7 @@ Connect::pre_process() return Event::pre_process_done(Status::EXISTS, _head_path); } - _arc = SharedPtr<ArcImpl>(new ArcImpl(tail_output, _head)); + _arc = SPtr<ArcImpl>(new ArcImpl(tail_output, _head)); rlock.release(); diff --git a/src/server/events/Connect.hpp b/src/server/events/Connect.hpp index a84b9fcf..4b515087 100644 --- a/src/server/events/Connect.hpp +++ b/src/server/events/Connect.hpp @@ -45,12 +45,12 @@ namespace Events { class Connect : public Event { public: - Connect(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - const Raul::Path& tail, - const Raul::Path& head); + Connect(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + const Raul::Path& tail, + const Raul::Path& head); bool pre_process(); void execute(ProcessContext& context); @@ -62,7 +62,7 @@ private: GraphImpl* _graph; InputPort* _head; CompiledGraph* _compiled_graph; - SharedPtr<ArcImpl> _arc; + SPtr<ArcImpl> _arc; Raul::Array<BufferRef>* _buffers; }; diff --git a/src/server/events/CreateBlock.cpp b/src/server/events/CreateBlock.cpp index 90a76c1d..63b05b58 100644 --- a/src/server/events/CreateBlock.cpp +++ b/src/server/events/CreateBlock.cpp @@ -33,7 +33,7 @@ namespace Server { namespace Events { CreateBlock::CreateBlock(Engine& engine, - SharedPtr<Interface> client, + SPtr<Interface> client, int32_t id, SampleCount timestamp, const Raul::Path& path, diff --git a/src/server/events/CreateBlock.hpp b/src/server/events/CreateBlock.hpp index 4b706e53..36e35775 100644 --- a/src/server/events/CreateBlock.hpp +++ b/src/server/events/CreateBlock.hpp @@ -41,7 +41,7 @@ class CreateBlock : public Event { public: CreateBlock(Engine& engine, - SharedPtr<Interface> client, + SPtr<Interface> client, int32_t id, SampleCount timestamp, const Raul::Path& block_path, diff --git a/src/server/events/CreateGraph.cpp b/src/server/events/CreateGraph.cpp index f2131246..8ab05a2e 100644 --- a/src/server/events/CreateGraph.cpp +++ b/src/server/events/CreateGraph.cpp @@ -30,7 +30,7 @@ namespace Server { namespace Events { CreateGraph::CreateGraph(Engine& engine, - SharedPtr<Interface> client, + SPtr<Interface> client, int32_t id, SampleCount timestamp, const Raul::Path& path, diff --git a/src/server/events/CreateGraph.hpp b/src/server/events/CreateGraph.hpp index 0f6a95dd..64fb92bd 100644 --- a/src/server/events/CreateGraph.hpp +++ b/src/server/events/CreateGraph.hpp @@ -36,7 +36,7 @@ class CreateGraph : public Event { public: CreateGraph(Engine& engine, - SharedPtr<Interface> client, + SPtr<Interface> client, int32_t id, SampleCount timestamp, const Raul::Path& path, diff --git a/src/server/events/CreatePort.cpp b/src/server/events/CreatePort.cpp index 818b0438..2e3e4d42 100644 --- a/src/server/events/CreatePort.cpp +++ b/src/server/events/CreatePort.cpp @@ -37,7 +37,7 @@ namespace Server { namespace Events { CreatePort::CreatePort(Engine& engine, - SharedPtr<Interface> client, + SPtr<Interface> client, int32_t id, SampleCount timestamp, const Raul::Path& path, diff --git a/src/server/events/CreatePort.hpp b/src/server/events/CreatePort.hpp index d35b58af..d5e2b29c 100644 --- a/src/server/events/CreatePort.hpp +++ b/src/server/events/CreatePort.hpp @@ -43,7 +43,7 @@ class CreatePort : public Event { public: CreatePort(Engine& engine, - SharedPtr<Interface> client, + SPtr<Interface> client, int32_t id, SampleCount timestamp, const Raul::Path& path, diff --git a/src/server/events/Delete.cpp b/src/server/events/Delete.cpp index bcfb209a..f21e0faf 100644 --- a/src/server/events/Delete.cpp +++ b/src/server/events/Delete.cpp @@ -34,11 +34,11 @@ namespace Ingen { namespace Server { namespace Events { -Delete::Delete(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - FrameTime time, - const Raul::URI& uri) +Delete::Delete(Engine& engine, + SPtr<Interface> client, + int32_t id, + FrameTime time, + const Raul::URI& uri) : Event(engine, client, id, time) , _uri(uri) , _engine_port(NULL) @@ -73,8 +73,8 @@ Delete::pre_process() return Event::pre_process_done(Status::NOT_FOUND, _path); } - if (!(_block = PtrCast<BlockImpl>(iter->second))) { - _port = PtrCast<DuplexPort>(iter->second); + if (!(_block = dynamic_ptr_cast<BlockImpl>(iter->second))) { + _port = dynamic_ptr_cast<DuplexPort>(iter->second); } if (!_block && !_port) { diff --git a/src/server/events/Delete.hpp b/src/server/events/Delete.hpp index 74046f82..3cf9a2dc 100644 --- a/src/server/events/Delete.hpp +++ b/src/server/events/Delete.hpp @@ -57,11 +57,11 @@ class DisconnectAll; class Delete : public Event { public: - Delete(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - FrameTime timestamp, - const Raul::URI& uri); + Delete(Engine& engine, + SPtr<Interface> client, + int32_t id, + FrameTime timestamp, + const Raul::URI& uri); ~Delete(); @@ -70,17 +70,17 @@ public: void post_process(); private: - Raul::URI _uri; - Raul::Path _path; - SharedPtr<BlockImpl> _block; ///< Non-NULL iff a block - SharedPtr<DuplexPort> _port; ///< Non-NULL iff a port - EnginePort* _engine_port; - Raul::Array<PortImpl*>* _ports_array; ///< New (external) ports for Graph - CompiledGraph* _compiled_graph; ///< Graph's new process order - DisconnectAll* _disconnect_event; - - SharedPtr<ControlBindings::Bindings> _removed_bindings; - Store::Objects _removed_objects; + Raul::URI _uri; + Raul::Path _path; + SPtr<BlockImpl> _block; ///< Non-NULL iff a block + SPtr<DuplexPort> _port; ///< Non-NULL iff a port + EnginePort* _engine_port; + Raul::Array<PortImpl*>* _ports_array; ///< New (external) ports for Graph + CompiledGraph* _compiled_graph; ///< Graph's new process order + DisconnectAll* _disconnect_event; + + SPtr<ControlBindings::Bindings> _removed_bindings; + Store::Objects _removed_objects; Glib::RWLock::WriterLock _lock; }; diff --git a/src/server/events/Delta.cpp b/src/server/events/Delta.cpp index 352aa56c..c7836ebd 100644 --- a/src/server/events/Delta.cpp +++ b/src/server/events/Delta.cpp @@ -44,15 +44,15 @@ namespace Events { typedef Resource::Properties Properties; -Delta::Delta(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - bool create, - Resource::Graph context, - const Raul::URI& subject, - const Properties& properties, - const Properties& remove) +Delta::Delta(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + bool create, + Resource::Graph context, + const Raul::URI& subject, + const Properties& properties, + const Properties& remove) : Event(engine, client, id, timestamp) , _create_event(NULL) , _subject(subject) diff --git a/src/server/events/Delta.hpp b/src/server/events/Delta.hpp index 34319591..7e3f5257 100644 --- a/src/server/events/Delta.hpp +++ b/src/server/events/Delta.hpp @@ -70,7 +70,7 @@ class Delta : public Event { public: Delta(Engine& engine, - SharedPtr<Interface> client, + SPtr<Interface> client, int32_t id, SampleCount timestamp, bool create, @@ -111,7 +111,7 @@ private: ControlBindings::Key _binding; bool _create; - SharedPtr<ControlBindings::Bindings> _old_bindings; + SPtr<ControlBindings::Bindings> _old_bindings; }; } // namespace Events diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp index 874e0d99..a7f31316 100644 --- a/src/server/events/Disconnect.cpp +++ b/src/server/events/Disconnect.cpp @@ -39,12 +39,12 @@ namespace Ingen { namespace Server { namespace Events { -Disconnect::Disconnect(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - const Raul::Path& tail_path, - const Raul::Path& head_path) +Disconnect::Disconnect(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + const Raul::Path& tail_path, + const Raul::Path& head_path) : Event(engine, client, id, timestamp) , _tail_path(tail_path) , _head_path(head_path) diff --git a/src/server/events/Disconnect.hpp b/src/server/events/Disconnect.hpp index b0c9408c..58efba9f 100644 --- a/src/server/events/Disconnect.hpp +++ b/src/server/events/Disconnect.hpp @@ -45,12 +45,12 @@ namespace Events { class Disconnect : public Event { public: - Disconnect(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - const Raul::Path& tail_path, - const Raul::Path& head_path); + Disconnect(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + const Raul::Path& tail_path, + const Raul::Path& head_path); bool pre_process(); void execute(ProcessContext& context); @@ -72,7 +72,7 @@ public: OutputPort* _src_output_port; InputPort* _dst_input_port; GraphImpl* _graph; - SharedPtr<ArcImpl> _arc; + SPtr<ArcImpl> _arc; Raul::Array<BufferRef>* _buffers; }; diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp index a3df4e77..c366508b 100644 --- a/src/server/events/DisconnectAll.cpp +++ b/src/server/events/DisconnectAll.cpp @@ -40,12 +40,12 @@ namespace Ingen { namespace Server { namespace Events { -DisconnectAll::DisconnectAll(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - const Raul::Path& parent_path, - const Raul::Path& path) +DisconnectAll::DisconnectAll(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + const Raul::Path& parent_path, + const Raul::Path& path) : Event(engine, client, id, timestamp) , _parent_path(parent_path) , _path(path) diff --git a/src/server/events/DisconnectAll.hpp b/src/server/events/DisconnectAll.hpp index 7db53bfa..43c3ec2b 100644 --- a/src/server/events/DisconnectAll.hpp +++ b/src/server/events/DisconnectAll.hpp @@ -43,12 +43,12 @@ class Disconnect; class DisconnectAll : public Event { public: - DisconnectAll(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - const Raul::Path& parent, - const Raul::Path& object); + DisconnectAll(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + const Raul::Path& parent, + const Raul::Path& object); DisconnectAll(Engine& engine, GraphImpl* parent, diff --git a/src/server/events/Get.cpp b/src/server/events/Get.cpp index f16654f7..9a5dd1fa 100644 --- a/src/server/events/Get.cpp +++ b/src/server/events/Get.cpp @@ -37,11 +37,11 @@ namespace Events { static void send_graph(Interface* client, const GraphImpl* graph); -Get::Get(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - const Raul::URI& uri) +Get::Get(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + const Raul::URI& uri) : Event(engine, client, id, timestamp) , _uri(uri) , _object(NULL) diff --git a/src/server/events/Get.hpp b/src/server/events/Get.hpp index 12f48b09..7a5830a3 100644 --- a/src/server/events/Get.hpp +++ b/src/server/events/Get.hpp @@ -37,11 +37,11 @@ namespace Events { class Get : public Event { public: - Get(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - const Raul::URI& uri); + Get(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + const Raul::URI& uri); bool pre_process(); void execute(ProcessContext& context) {} diff --git a/src/server/events/Move.cpp b/src/server/events/Move.cpp index 700d5814..44939525 100644 --- a/src/server/events/Move.cpp +++ b/src/server/events/Move.cpp @@ -31,12 +31,12 @@ namespace Ingen { namespace Server { namespace Events { -Move::Move(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - const Raul::Path& path, - const Raul::Path& new_path) +Move::Move(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + const Raul::Path& path, + const Raul::Path& new_path) : Event(engine, client, id, timestamp) , _old_path(path) , _new_path(new_path) diff --git a/src/server/events/Move.hpp b/src/server/events/Move.hpp index 6e30cba6..666ad7bd 100644 --- a/src/server/events/Move.hpp +++ b/src/server/events/Move.hpp @@ -46,12 +46,12 @@ namespace Events { class Move : public Event { public: - Move(Engine& engine, - SharedPtr<Interface> client, - int32_t id, - SampleCount timestamp, - const Raul::Path& old_path, - const Raul::Path& new_path); + Move(Engine& engine, + SPtr<Interface> client, + int32_t id, + SampleCount timestamp, + const Raul::Path& old_path, + const Raul::Path& new_path); ~Move(); diff --git a/src/server/events/SetPortValue.cpp b/src/server/events/SetPortValue.cpp index f2399d8e..edef9e8c 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, - SharedPtr<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 Raul::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 a82553f5..32e8f768 100644 --- a/src/server/events/SetPortValue.hpp +++ b/src/server/events/SetPortValue.hpp @@ -37,12 +37,12 @@ namespace Events { class SetPortValue : public Event { public: - SetPortValue(Engine& engine, - SharedPtr<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 Raul::Atom& value); ~SetPortValue(); |