Eliminate redundant object collections (ObjectModel having a separate collection of its children).

Fix renaming/creation of children (fix ticket 97).


git-svn-id: http://svn.drobilla.net/lad/ingen@844 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 8 insertions, 7 deletions

diff --git a/src/libs/client/NodeModel.cpp b/src/libs/client/NodeModel.cpp
index 52a4e1e9..b8c8e901 100644
--- a/src/libs/client/NodeModel.cpp
+++ b/src/libs/client/NodeModel.cpp
@@ -26,15 +26,15 @@ namespace Ingen {
 namespace Client {
 
 
-NodeModel::NodeModel(SharedPtr<PluginModel> plugin, const Path& path, bool polyphonic)
-	: ObjectModel(path, polyphonic)
+NodeModel::NodeModel(Store& store, SharedPtr<PluginModel> plugin, const Path& path, bool polyphonic)
+	: ObjectModel(store, path, polyphonic)
 	, _plugin_uri(plugin->uri())
 	, _plugin(plugin)
 {
 }
 
-NodeModel::NodeModel(const string& plugin_uri, const Path& path, bool polyphonic)
-	: ObjectModel(path, polyphonic)
+NodeModel::NodeModel(Store& store, const string& plugin_uri, const Path& path, bool polyphonic)
+	: ObjectModel(store, path, polyphonic)
 	, _plugin_uri(plugin_uri)
 {
 }
@@ -86,7 +86,7 @@ NodeModel::add_child(SharedPtr<ObjectModel> c)
 {
 	assert(c->parent().get() == this);
 	
-	ObjectModel::add_child(c);
+	//ObjectModel::add_child(c);
 
 	SharedPtr<PortModel> pm = PtrCast<PortModel>(c);
 	assert(pm);
@@ -100,13 +100,14 @@ NodeModel::remove_child(SharedPtr<ObjectModel> c)
 	assert(c->path().is_child_of(_path));
 	assert(c->parent().get() == this);
 	
-	bool ret = ObjectModel::remove_child(c);
+	//bool ret = ObjectModel::remove_child(c);
 
 	SharedPtr<PortModel> pm = PtrCast<PortModel>(c);
 	assert(pm);
 	remove_port(pm);
 
-	return ret;
+	//return ret;
+	return true;
 }