diff options
| author | David Robillard <d@drobilla.net> | 2006-09-11 11:10:35 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-09-11 11:10:35 +0000 |
| commit | b15864870d34a1188eda93ad215734275037278e (patch) | |
| tree | 224a1669a29091ea4198425d4a002e448cde8b30 /src/progs/ingenuity/ControlPanel.cpp | |
| parent | 22bf43352ddfc48452d776f10ad4d12161255049 (diff) | |
| download | ingen-b15864870d34a1188eda93ad215734275037278e.tar.gz ingen-b15864870d34a1188eda93ad215734275037278e.tar.bz2 ingen-b15864870d34a1188eda93ad215734275037278e.zip | |
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
Diffstat (limited to 'src/progs/ingenuity/ControlPanel.cpp')
| -rw-r--r-- | src/progs/ingenuity/ControlPanel.cpp | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/progs/ingenuity/ControlPanel.cpp b/src/progs/ingenuity/ControlPanel.cpp index 57ac7824..90d17c8a 100644 --- a/src/progs/ingenuity/ControlPanel.cpp +++ b/src/progs/ingenuity/ControlPanel.cpp @@ -67,14 +67,7 @@ ControlPanel::init(NodeController* node, size_t poly) for (PortModelList::const_iterator i = node_model->ports().begin(); i != node_model->ports().end(); ++i) { - // FIXME: - if (*i) { - PortController* pc = (PortController*)((*i)->controller()); - assert(pc != NULL); - add_port(pc); - } else { - cerr << "WTF?\n"; - } + add_port(*i); } m_callback_enabled = true; @@ -95,13 +88,9 @@ ControlPanel::find_port(const Path& path) const /** Add a control to the panel for the given port. */ void -ControlPanel::add_port(PortController* port) +ControlPanel::add_port(CountedPtr<PortModel> pm) { - assert(port); - assert(port->model()); - //assert(port->control_panel() == NULL); - - const CountedPtr<PortModel> pm = port->port_model(); + assert(pm); // Already have port, don't add another if (find_port(pm->path()) != NULL) @@ -131,8 +120,6 @@ ControlPanel::add_port(PortController* port) // pm->disconnection_sig.connect(bind(sigc::mem_fun(this, &ControlPanel::disconnection), pm)) } - //port->set_control_panel(this); - Gtk::Requisition controls_size; m_control_box->size_request(controls_size); m_ideal_size.first = controls_size.width; |