From 30e15b2f613d93eae8a4a122583dd0a16b1ab609 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 3 Jun 2011 18:14:32 +0000 Subject: Remove use of boost::enable_shared_from_this. Instead, just store a pointer to the containing canvas in Items, since it should not be possible for an Item to outlive its containing Canvas anyway. Shrinks Item memory overhead a tad and gives a minor performance boost as an added bonus. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3354 a436a847-0d15-0410-975c-d299462d15a1 --- src/gui/PatchPortModule.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/gui/PatchPortModule.cpp') diff --git a/src/gui/PatchPortModule.cpp b/src/gui/PatchPortModule.cpp index 14861069..b04cc6ba 100644 --- a/src/gui/PatchPortModule.cpp +++ b/src/gui/PatchPortModule.cpp @@ -38,12 +38,11 @@ using namespace Raul; namespace Ingen { namespace GUI { -PatchPortModule::PatchPortModule(boost::shared_ptr canvas, - SharedPtr model) +PatchPortModule::PatchPortModule(PatchCanvas& canvas, + SharedPtr model) : FlowCanvas::Module(canvas, "", 0, 0, false) // FIXME: coords? , _model(model) { - assert(canvas); assert(model); assert(PtrCast(model->parent())); @@ -55,9 +54,9 @@ PatchPortModule::PatchPortModule(boost::shared_ptr canvas, } boost::shared_ptr -PatchPortModule::create(boost::shared_ptr canvas, - SharedPtr model, - bool human) +PatchPortModule::create(PatchCanvas& canvas, + SharedPtr model, + bool human) { boost::shared_ptr ret(new PatchPortModule(canvas, model)); boost::shared_ptr port(Port::create(ret, model, human, true)); @@ -150,9 +149,9 @@ PatchPortModule::property_changed(const URI& key, const Atom& value) } else if (key == uris.ingen_selected) { if (value.get_bool() != selected()) { if (value.get_bool()) { - _canvas.lock()->select_item(shared_from_this()); + _canvas->select_item(shared_from_this()); } else { - _canvas.lock()->unselect_item(shared_from_this()); + _canvas->unselect_item(shared_from_this()); } } } -- cgit v1.2.1