Cleaned up client-side model code significantly (made everything private

so only Store can change the state of models).
Extremely broken, just committing to move code between machines :).


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

10 files changed, 31 insertions, 26 deletions

diff --git a/src/progs/demolition/DemolitionClientInterface.h b/src/progs/demolition/DemolitionClientInterface.h
index e1093411..809857cf 100644
--- a/src/progs/demolition/DemolitionClientInterface.h
+++ b/src/progs/demolition/DemolitionClientInterface.h
@@ -14,7 +14,6 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-
 #ifndef DEMOLITIONCLIENTHOOKS_H
 #define DEMOLITIONCLIENTHOOKS_H
 
diff --git a/src/progs/ingenuity/ControlGroups.cpp b/src/progs/ingenuity/ControlGroups.cpp
index 06f49f86..9b809cff 100644
--- a/src/progs/ingenuity/ControlGroups.cpp
+++ b/src/progs/ingenuity/ControlGroups.cpp
@@ -247,7 +247,7 @@ SliderControlGroup::update_value_from_slider()
 		m_enable_signal = false;
 		m_value_spinner.set_value(value);
 		m_control_panel->value_changed(m_port_model->path(), value);
-		m_port_model->value(value);
+		//m_port_model->value(value);
 		m_enable_signal = true;
 	}
 }
@@ -273,7 +273,7 @@ SliderControlGroup::update_value_from_spinner()
 
 		m_control_panel->value_changed(m_port_model->path(), value);
 		
-		m_port_model->value(value);
+		//m_port_model->value(value);
 		m_enable_signal = true;
 	}
 }
@@ -369,7 +369,7 @@ IntegerControlGroup::update_value()
 	if (m_enable_signal) {
 		float value = m_spinner.get_value();
 		m_control_panel->value_changed(m_port_model->path(), value);
-		m_port_model->value(value);
+		//m_port_model->value(value);
 	}
 }
 
@@ -440,7 +440,7 @@ ToggleControlGroup::update_value()
 	if (m_enable_signal) {
 		float value = m_checkbutton.get_active() ? 1.0f : 0.0f;
 		m_control_panel->value_changed(m_port_model->path(), value);
-		m_port_model->value(value);
+		//m_port_model->value(value);
 	}
 }
 
diff --git a/src/progs/ingenuity/LoadPatchWindow.cpp b/src/progs/ingenuity/LoadPatchWindow.cpp
index 5e740aac..1fa5c2ba 100644
--- a/src/progs/ingenuity/LoadPatchWindow.cpp
+++ b/src/progs/ingenuity/LoadPatchWindow.cpp
@@ -118,13 +118,14 @@ LoadPatchWindow::ok_clicked()
 	if (m_replace)
 		App::instance().engine()->clear_patch(m_patch->path());
 
-	CountedPtr<PatchModel> pm(new PatchModel(m_patch->path(), poly));
-	pm->filename(get_filename());
-	pm->set_metadata("filename", Atom(get_filename().c_str()));
+	cerr << "FIXME: load patch" << endl;
+	//CountedPtr<PatchModel> pm(new PatchModel(m_patch->path(), poly));
+	//pm->filename(get_filename());
+	//pm->set_metadata("filename", Atom(get_filename().c_str()));
 	// FIXME: necessary?
 	//pm->set_parent(m_patch->parent());
 	//App::instance().engine()->push_added_patch(pm);
-	App::instance().loader()->load_patch(pm, true, true);
+	//App::instance().loader()->load_patch(pm, true, true);
 	
 	hide();
 }			
diff --git a/src/progs/ingenuity/LoadPluginWindow.cpp b/src/progs/ingenuity/LoadPluginWindow.cpp
index 9321b12a..2c09584c 100644
--- a/src/progs/ingenuity/LoadPluginWindow.cpp
+++ b/src/progs/ingenuity/LoadPluginWindow.cpp
@@ -313,11 +313,8 @@ LoadPluginWindow::add_clicked()
 
 			dialog.run();
 		} else {
-			const string path = m_patch->path().base() + name;
-			NodeModel* nm = new NodeModel(plugin, path, polyphonic);
-			nm->add_metadata(m_initial_data);
-			
-			App::instance().engine()->create_node_from_model(nm);
+			Path path = m_patch->path().base() + Path::nameify(name);
+			App::instance().engine()->create_node_with_data(plugin->uri(), path, polyphonic, m_initial_data);
 			++m_plugin_name_offset;
 			m_node_name_entry->set_text(generate_module_name(m_plugin_name_offset));
 			
diff --git a/src/progs/ingenuity/LoadSubpatchWindow.cpp b/src/progs/ingenuity/LoadSubpatchWindow.cpp
index cb7a7ef6..ed5da0ee 100644
--- a/src/progs/ingenuity/LoadSubpatchWindow.cpp
+++ b/src/progs/ingenuity/LoadSubpatchWindow.cpp
@@ -158,10 +158,8 @@ LoadSubpatchWindow::ok_clicked()
 		//	m_new_module_x, m_new_module_y);
 	}
 
-	CountedPtr<PatchModel> pm(new PatchModel(m_patch->path().base() + name, poly));
+	/*CountedPtr<PatchModel> pm(new PatchModel(m_patch->path().base() + name, poly));
 	pm->filename(filename);
-	// FIXME: necessary?
-	//pm->set_parent(m_patch);
 	
 	pm->set_metadata("module-x", Atom((float)m_new_module_x));
 	pm->set_metadata("module-y", Atom((float)m_new_module_y));
@@ -169,7 +167,9 @@ LoadSubpatchWindow::ok_clicked()
 	App::instance().loader()->load_patch(pm, true, false);
 
 	App::instance().configuration()->set_patch_folder(pm->filename().substr(0, pm->filename().find_last_of("/")));
-	
+	*/
+	cerr << "FIXME: load subpatch" << endl;
+
 	hide();
 }			
 
diff --git a/src/progs/ingenuity/NewSubpatchWindow.cpp b/src/progs/ingenuity/NewSubpatchWindow.cpp
index 8d673622..1d730582 100644
--- a/src/progs/ingenuity/NewSubpatchWindow.cpp
+++ b/src/progs/ingenuity/NewSubpatchWindow.cpp
@@ -87,6 +87,8 @@ NewSubpatchWindow::name_changed()
 void
 NewSubpatchWindow::ok_clicked()
 {
+	cerr << "FIXME: new subpatch\n";
+#if 0
 	PatchModel* pm = new PatchModel(
 		m_patch->path().base() + m_name_entry->get_text(),
 		m_poly_spinbutton->get_value_as_int());
@@ -102,6 +104,7 @@ NewSubpatchWindow::ok_clicked()
 	pm->set_metadata("module-x", (float)m_new_module_x);
 	pm->set_metadata("module-y", (float)m_new_module_y);
 	App::instance().engine()->create_patch_from_model(pm);
+#endif
 	hide();
 }			
 
diff --git a/src/progs/ingenuity/OmFlowCanvas.cpp b/src/progs/ingenuity/OmFlowCanvas.cpp
index 0d2e9bb0..dfd89f8a 100644
--- a/src/progs/ingenuity/OmFlowCanvas.cpp
+++ b/src/progs/ingenuity/OmFlowCanvas.cpp
@@ -196,6 +196,8 @@ OmFlowCanvas::connect(const Port* src_port, const Port* dst_port)
 	if (src->model()->type() == PortModel::MIDI &&
 			dst->model()->type() == PortModel::CONTROL)
 	{
+		cerr << "FIXME: MIDI binding" << endl;
+#if 0
 		CountedPtr<PluginModel> pm(new PluginModel(PluginModel::Internal, "", "midi_control_in", ""));
 		CountedPtr<NodeModel> nm(new NodeModel(pm, m_patch->path().base()
 			+ src->name() + "-" + dst->name(), false));
@@ -214,9 +216,9 @@ OmFlowCanvas::connect(const Port* src_port, const Port* dst_port)
 			dst->model()->get_metadata("user-min").get_float());
 		App::instance().engine()->set_port_value_queued(nm->path().base() + "Max",
 			dst->model()->get_metadata("user-max").get_float());
+#endif
 	} else {
-		App::instance().engine()->connect(src->model()->path(),
-		                    dst->model()->path());
+		App::instance().engine()->connect(src->model()->path(), dst->model()->path());
 	}
 }
 
diff --git a/src/progs/ingenuity/PatchPropertiesWindow.cpp b/src/progs/ingenuity/PatchPropertiesWindow.cpp
index b6dd5e7f..51912fe9 100644
--- a/src/progs/ingenuity/PatchPropertiesWindow.cpp
+++ b/src/progs/ingenuity/PatchPropertiesWindow.cpp
@@ -74,8 +74,10 @@ PatchPropertiesWindow::cancel_clicked()
 void
 PatchPropertiesWindow::ok_clicked()
 {
-	m_patch_model->set_metadata("author", Atom(m_author_entry->get_text().c_str()));
-	m_patch_model->set_metadata("description", Atom(m_textview->get_buffer()->get_text().c_str()));
+	cerr << "FIXME: properties\n";
+
+	//m_patch_model->set_metadata("author", Atom(m_author_entry->get_text().c_str()));
+	//m_patch_model->set_metadata("description", Atom(m_textview->get_buffer()->get_text().c_str()));
 	hide();
 }
 
diff --git a/src/progs/ingenuity/PatchWindow.cpp b/src/progs/ingenuity/PatchWindow.cpp
index 1aec1977..6915b4a1 100644
--- a/src/progs/ingenuity/PatchWindow.cpp
+++ b/src/progs/ingenuity/PatchWindow.cpp
@@ -283,7 +283,7 @@ PatchWindow::event_save_as()
 		
 		if (confirm) {
 			App::instance().loader()->save_patch(m_patch, filename, recursive);
-			m_patch->filename(filename);
+			//m_patch->set_metadata("filename", Atom(filename.c_str()));
 		}
 	}
 	App::instance().configuration()->set_patch_folder(dialog.get_current_folder());
diff --git a/src/progs/patch_loader/patch_loader.cpp b/src/progs/patch_loader/patch_loader.cpp
index f7464840..69a06407 100644
--- a/src/progs/patch_loader/patch_loader.cpp
+++ b/src/progs/patch_loader/patch_loader.cpp
@@ -71,9 +71,10 @@ int main(int argc, char** argv)
 
 	// Load patches
 	for (uint i=0; i < args_info.inputs_num; ++i) {
-		CountedPtr<PatchModel> pm(new PatchModel("", 0));
-		pm->filename(args_info.inputs[i]);
-		librarian.load_patch(pm, true);
+		cerr << "FIXME: load patch" << endl;
+		//CountedPtr<PatchModel> pm(new PatchModel("", 0));
+		//pm->filename(args_info.inputs[i]);
+		//librarian.load_patch(pm, true);
 	}
 	
 	return 0;