From b15864870d34a1188eda93ad215734275037278e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 11 Sep 2006 11:10:35 +0000 Subject: Switched homebrew CountedPtr to boost::shared_ptr. Factories for patch windows, controller. Robustness updated in many places. Tons of cleanups, rewrites, bugfixes, etc. git-svn-id: http://svn.drobilla.net/lad/ingen@128 a436a847-0d15-0410-975c-d299462d15a1 --- src/progs/ingenuity/PortController.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/progs/ingenuity/PortController.cpp') diff --git a/src/progs/ingenuity/PortController.cpp b/src/progs/ingenuity/PortController.cpp index 6a23169f..167cb594 100644 --- a/src/progs/ingenuity/PortController.cpp +++ b/src/progs/ingenuity/PortController.cpp @@ -34,9 +34,6 @@ PortController::PortController(CountedPtr model) { assert(model); assert(model->parent()); - assert(model->controller() == NULL); - - model->set_controller(this); } @@ -44,8 +41,8 @@ void PortController::destroy() { assert(m_model->parent()); - NodeController* parent = (NodeController*)m_model->parent()->controller(); - assert(parent != NULL); + CountedPtr parent = PtrCast(m_model->parent()->controller()); + assert(parent); parent->remove_port(path(), false); } @@ -73,7 +70,7 @@ PortController::create_module(OmFlowCanvas* canvas) m_module = new OmPortModule(canvas, this, x, y); - if (CountedPtr(port_model()->parent())) { + if (PtrCast(port_model()->parent())) { if (m_patch_port) delete m_patch_port; -- cgit v1.2.1