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.cpp | |
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.cpp')
-rw-r--r-- | src/server/LV2Block.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/server/LV2Block.cpp b/src/server/LV2Block.cpp index e334c1f9..1d05137b 100644 --- a/src/server/LV2Block.cpp +++ b/src/server/LV2Block.cpp @@ -69,7 +69,7 @@ LV2Block::~LV2Block() delete _instances; } -SharedPtr<LilvInstance> +SPtr<LilvInstance> LV2Block::make_instance(URIs& uris, SampleRate rate, uint32_t voice, @@ -82,7 +82,7 @@ LV2Block::make_instance(URIs& uris, parent_graph()->engine().log().error( Raul::fmt("Failed to instantiate <%1%>\n") % _lv2_plugin->uri().c_str()); - return SharedPtr<LilvInstance>(); + return SPtr<LilvInstance>(); } const LV2_Options_Interface* options_iface = (const LV2_Options_Interface*) @@ -134,7 +134,7 @@ LV2Block::make_instance(URIs& uris, parent_graph()->engine().log().error( Raul::fmt("%1% auto-morphed to unknown type %2%\n") % port->path().c_str() % type); - return SharedPtr<LilvInstance>(); + return SPtr<LilvInstance>(); } } else { parent_graph()->engine().log().error( @@ -145,7 +145,7 @@ LV2Block::make_instance(URIs& uris, } } - return SharedPtr<LilvInstance>(inst, lilv_instance_free); + return SPtr<LilvInstance>(inst, lilv_instance_free); } bool @@ -161,9 +161,9 @@ LV2Block::prepare_poly(BufferFactory& bufs, uint32_t poly) const SampleRate rate = bufs.engine().driver()->sample_rate(); assert(!_prepared_instances); - _prepared_instances = new Instances(poly, *_instances, SharedPtr<void>()); + _prepared_instances = new Instances(poly, *_instances, SPtr<void>()); for (uint32_t i = _polyphony; i < _prepared_instances->size(); ++i) { - SharedPtr<LilvInstance> inst = make_instance(bufs.uris(), rate, i, true); + SPtr<LilvInstance> inst = make_instance(bufs.uris(), rate, i, true); if (!inst) { return false; } @@ -206,7 +206,7 @@ bool LV2Block::instantiate(BufferFactory& bufs) { const Ingen::URIs& uris = bufs.uris(); - SharedPtr<LV2Info> info = _lv2_plugin->lv2_info(); + SPtr<LV2Info> info = _lv2_plugin->lv2_info(); const LilvPlugin* plug = _lv2_plugin->lilv_plugin(); Ingen::Forge& forge = bufs.forge(); const uint32_t num_ports = lilv_plugin_get_num_ports(plug); @@ -401,7 +401,7 @@ LV2Block::instantiate(BufferFactory& bufs) // Actually create plugin instances and port buffers. const SampleRate rate = bufs.engine().driver()->sample_rate(); - _instances = new Instances(_polyphony, SharedPtr<void>()); + _instances = new Instances(_polyphony, SPtr<void>()); for (uint32_t i = 0; i < _polyphony; ++i) { _instances->at(i) = make_instance(bufs.uris(), rate, i, false); if (!_instances->at(i)) { |