Added proper new loading interface to Serializer, updated everything that uses it (no actual implementation yet).

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

1 files changed, 10 insertions, 7 deletions

diff --git a/src/progs/ingenuity/LoadSubpatchWindow.cpp b/src/progs/ingenuity/LoadSubpatchWindow.cpp
index 9aea1bd6..6a8aa24d 100644
--- a/src/progs/ingenuity/LoadSubpatchWindow.cpp
+++ b/src/progs/ingenuity/LoadSubpatchWindow.cpp
@@ -136,20 +136,23 @@ LoadSubpatchWindow::ok_clicked()
 {
 	assert(m_patch);
 	
-	const string filename = get_filename();
-
-	string name = "";
-	int    poly = 1;
+	// If unset load_patch will load values
+	optional<const string&> name;
+	optional<size_t> poly;
+	string name_str = "";
 	
-	if (m_name_from_user_radio->get_active())
-		name = m_name_entry->get_text();
+	if (m_name_from_user_radio->get_active()) {
+		name_str = m_name_entry->get_text();
+		name = name_str;
+	}
 
 	if (m_poly_from_user_radio->get_active())
 		poly = m_poly_spinbutton->get_value_as_int();
 	else if (m_poly_from_parent_radio->get_active())
 		poly = m_patch->poly();
 
-	App::instance().loader()->load_patch(filename, m_patch->path(), name, poly, m_initial_data);
+	App::instance().loader()->load_patch(false, get_filename(), "/",
+		m_initial_data, m_patch->parent()->path(), name, poly);
 
 	hide();
 }