summaryrefslogtreecommitdiffstats
path: root/src/progs/gtk
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/gtk')
-rw-r--r--src/progs/gtk/GtkObjectController.cpp11
-rw-r--r--src/progs/gtk/GtkObjectController.h7
-rw-r--r--src/progs/gtk/NodeController.cpp15
3 files changed, 14 insertions, 19 deletions
diff --git a/src/progs/gtk/GtkObjectController.cpp b/src/progs/gtk/GtkObjectController.cpp
index 49abe58f..241f123b 100644
--- a/src/progs/gtk/GtkObjectController.cpp
+++ b/src/progs/gtk/GtkObjectController.cpp
@@ -23,16 +23,7 @@ GtkObjectController::GtkObjectController(CountedPtr<ObjectModel> model)
: m_model(model)
{
assert(m_model);
-}
-
-
-/** Derived classes should override this to handle special metadata
- * keys, then call this to set the model's metadata key.
- */
-void
-GtkObjectController::metadata_update(const string& key, const string& value)
-{
- m_model->set_metadata(key, value);
+ model->metadata_update_sig.connect(sigc::mem_fun(this, &GtkObjectController::metadata_update));
}
diff --git a/src/progs/gtk/GtkObjectController.h b/src/progs/gtk/GtkObjectController.h
index f80db6a4..77860a9c 100644
--- a/src/progs/gtk/GtkObjectController.h
+++ b/src/progs/gtk/GtkObjectController.h
@@ -58,7 +58,12 @@ public:
virtual void add_to_store() = 0;
virtual void remove_from_store() = 0;
*/
- virtual void metadata_update(const string& key, const string& value);
+
+ /** Derived classes should override this to handle special metadata
+ * keys, then call this to set the model's metadata key.
+ */
+ virtual void metadata_update(const string& key, const string& value)
+ { assert(m_model->get_metadata(key) != ""); }
/** Rename object */
virtual void set_path(const Path& new_path)
diff --git a/src/progs/gtk/NodeController.cpp b/src/progs/gtk/NodeController.cpp
index 63994c00..7965c35a 100644
--- a/src/progs/gtk/NodeController.cpp
+++ b/src/progs/gtk/NodeController.cpp
@@ -50,12 +50,11 @@ NodeController::NodeController(CountedPtr<NodeModel> model)
model->set_controller(this);
// Create port controllers
- cerr << "FIXME: NodeController()" << endl;
- /*
- for (list<PortModel*>::const_iterator i = node_model()->ports().begin();
+ for (PortModelList::const_iterator i = node_model()->ports().begin();
i != node_model()->ports().end(); ++i) {
- assert((*i)->controller() == NULL);
+ assert(!(*i)->controller());
assert((*i)->parent() == model.get());
+ // FIXME: leak
PortController* const pc = new PortController(*i);
assert((*i)->controller() == pc); // PortController() does this
}
@@ -83,13 +82,12 @@ NodeController::NodeController(CountedPtr<NodeModel> model)
m_controls_menuitem->property_sensitive() = false;
- if (node_model()->plugin()->type() == PluginModel::Internal
+ if (node_model()->plugin() && node_model()->plugin()->type() == PluginModel::Internal
&& node_model()->plugin()->plug_label() == "midi_control_in") {
Gtk::Menu::MenuList& items = m_menu.items();
items.push_back(Gtk::Menu_Helpers::MenuElem("Learn",
sigc::mem_fun(this, &NodeController::on_menu_learn)));
}
- */
model->new_port_sig.connect(sigc::mem_fun(this, &NodeController::add_port));
}
@@ -227,11 +225,12 @@ NodeController::metadata_update(const string& key, const string& value)
void
NodeController::add_port(CountedPtr<PortModel> pm)
{
- assert(pm->parent() == NULL);
+ assert(pm->parent() == node_model().get());
+ assert(node_model()->get_port(pm->name()) == pm);
cout << "[NodeController] Adding port " << pm->path() << endl;
- node_model()->add_port(pm);
+ // FIXME: leak
PortController* pc = new PortController(pm);
assert(pm->controller() == pc);
//pc->add_to_store();