diff options
| author | David Robillard <d@drobilla.net> | 2011-06-03 18:14:32 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-06-03 18:14:32 +0000 |
| commit | 30e15b2f613d93eae8a4a122583dd0a16b1ab609 (patch) | |
| tree | 9ab219bc86ffde3d571ccdee18794acbe8dbc747 /src/gui/PatchPortModule.cpp | |
| parent | e15a1ca67583535193e3e2b13ff006d93a7dcf14 (diff) | |
| download | ingen-30e15b2f613d93eae8a4a122583dd0a16b1ab609.tar.gz ingen-30e15b2f613d93eae8a4a122583dd0a16b1ab609.tar.bz2 ingen-30e15b2f613d93eae8a4a122583dd0a16b1ab609.zip | |
Remove use of boost::enable_shared_from_this<Canvas>.
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
Diffstat (limited to 'src/gui/PatchPortModule.cpp')
| -rw-r--r-- | src/gui/PatchPortModule.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
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<PatchCanvas> canvas, - SharedPtr<const PortModel> model) +PatchPortModule::PatchPortModule(PatchCanvas& canvas, + SharedPtr<const PortModel> model) : FlowCanvas::Module(canvas, "", 0, 0, false) // FIXME: coords? , _model(model) { - assert(canvas); assert(model); assert(PtrCast<const PatchModel>(model->parent())); @@ -55,9 +54,9 @@ PatchPortModule::PatchPortModule(boost::shared_ptr<PatchCanvas> canvas, } boost::shared_ptr<PatchPortModule> -PatchPortModule::create(boost::shared_ptr<PatchCanvas> canvas, - SharedPtr<const PortModel> model, - bool human) +PatchPortModule::create(PatchCanvas& canvas, + SharedPtr<const PortModel> model, + bool human) { boost::shared_ptr<PatchPortModule> ret(new PatchPortModule(canvas, model)); boost::shared_ptr<Port> 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()); } } } |