diff options
| author | David Robillard <d@drobilla.net> | 2013-01-12 23:38:03 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2013-01-12 23:38:03 +0000 |
| commit | df1447c665e6c3631961297a9d3e9aff4e94c47f (patch) | |
| tree | c0ff117c362e6d571f430f886ab62f372b59af08 /ingen/client/GraphModel.hpp | |
| parent | bb335dca695273622b7a4ebbefbe9e089edb9ab4 (diff) | |
| download | ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.gz ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.tar.bz2 ingen-df1447c665e6c3631961297a9d3e9aff4e94c47f.zip | |
Remove Raul::SharedPtr and switch to std::shared_ptr.
Use project local short type aliases for shared_ptr and friends.
Move Raul::Disposable and Raul::Manageable into Raul::Maid.
Use sets to store machina nodes and edges to avoid O(n) searches.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4939 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'ingen/client/GraphModel.hpp')
| -rw-r--r-- | ingen/client/GraphModel.hpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ingen/client/GraphModel.hpp b/ingen/client/GraphModel.hpp index 996e9129..7a899ecb 100644 --- a/ingen/client/GraphModel.hpp +++ b/ingen/client/GraphModel.hpp @@ -18,7 +18,7 @@ #define INGEN_CLIENT_GRAPHMODEL_HPP #include "ingen/client/BlockModel.hpp" -#include "raul/SharedPtr.hpp" +#include "ingen/types.hpp" namespace Ingen { namespace Client { @@ -37,18 +37,18 @@ public: GraphType graph_type() const { return Node::GraphType::GRAPH; } - SharedPtr<ArcModel> get_arc(const Ingen::Node* tail, - const Ingen::Node* head); + SPtr<ArcModel> get_arc(const Ingen::Node* tail, + const Ingen::Node* head); bool enabled() const; bool polyphonic() const; uint32_t internal_poly() const; // Signals - INGEN_SIGNAL(new_block, void, SharedPtr<BlockModel>); - INGEN_SIGNAL(removed_block, void, SharedPtr<BlockModel>); - INGEN_SIGNAL(new_arc, void, SharedPtr<ArcModel>); - INGEN_SIGNAL(removed_arc, void, SharedPtr<ArcModel>); + INGEN_SIGNAL(new_block, void, SPtr<BlockModel>); + INGEN_SIGNAL(removed_block, void, SPtr<BlockModel>); + INGEN_SIGNAL(new_arc, void, SPtr<ArcModel>); + INGEN_SIGNAL(removed_arc, void, SPtr<ArcModel>); private: friend class ClientStore; @@ -58,10 +58,10 @@ private: {} void clear(); - void add_child(SharedPtr<ObjectModel> c); - bool remove_child(SharedPtr<ObjectModel> c); + void add_child(SPtr<ObjectModel> c); + bool remove_child(SPtr<ObjectModel> c); - void add_arc(SharedPtr<ArcModel> arc); + void add_arc(SPtr<ArcModel> arc); void remove_arc(const Ingen::Node* tail, const Ingen::Node* head); }; |