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 /src/server/LV2Block.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 'src/server/LV2Block.hpp')
-rw-r--r-- | src/server/LV2Block.hpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp index 2e45d350..a9cf0afc 100644 --- a/src/server/LV2Block.hpp +++ b/src/server/LV2Block.hpp @@ -19,7 +19,7 @@ #include "lilv/lilv.h" #include "lv2/lv2plug.in/ns/ext/worker/worker.h" -#include "raul/Disposable.hpp" +#include "raul/Maid.hpp" #include "BufferRef.hpp" #include "BlockImpl.hpp" @@ -63,18 +63,18 @@ public: BufferRef buf); protected: - SharedPtr<LilvInstance> make_instance(URIs& uris, - SampleRate rate, - uint32_t voice, - bool preparing); + SPtr<LilvInstance> make_instance(URIs& uris, + SampleRate rate, + uint32_t voice, + bool preparing); inline LilvInstance* instance(uint32_t voice) { return (LilvInstance*)(*_instances)[voice].get(); } - typedef Raul::Array< SharedPtr<void> > Instances; + typedef Raul::Array< SPtr<void> > Instances; - struct Response : public Raul::Disposable + struct Response : public Raul::Maid::Disposable , public Raul::Noncopyable , public boost::intrusive::slist_base_hook<> { @@ -101,12 +101,12 @@ protected: static LV2_Worker_Status work_respond( LV2_Worker_Respond_Handle handle, uint32_t size, const void* data); - LV2Plugin* _lv2_plugin; - Instances* _instances; - Instances* _prepared_instances; - const LV2_Worker_Interface* _worker_iface; - Responses _responses; - SharedPtr<LV2Features::FeatureArray> _features; + LV2Plugin* _lv2_plugin; + Instances* _instances; + Instances* _prepared_instances; + const LV2_Worker_Interface* _worker_iface; + Responses _responses; + SPtr<LV2Features::FeatureArray> _features; }; } // namespace Server |