diff options
author | David Robillard <d@drobilla.net> | 2006-09-18 06:24:53 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-09-18 06:24:53 +0000 |
commit | 6f93b3d7c80f9dee2d95fac1bbc4f781a6f45979 (patch) | |
tree | 82b27a4802198215546558c006f7ac4228ab0599 /src/progs/ingenuity/LoadSubpatchWindow.cpp | |
parent | d520692eb49ff9e5aded38061a204713571b095b (diff) | |
download | ingen-6f93b3d7c80f9dee2d95fac1bbc4f781a6f45979.tar.gz ingen-6f93b3d7c80f9dee2d95fac1bbc4f781a6f45979.tar.bz2 ingen-6f93b3d7c80f9dee2d95fac1bbc4f781a6f45979.zip |
Work on loading old (deprecated) patches.
More error tolerance in Store, related bugfixes.
Patch port adding (threading) bug fixed (made event blocking).
Better PatchView cacheing.
Moved generic things from engine to util (shared)
Bug fixes, features, etc.
git-svn-id: http://svn.drobilla.net/lad/ingen@142 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs/ingenuity/LoadSubpatchWindow.cpp')
-rw-r--r-- | src/progs/ingenuity/LoadSubpatchWindow.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/progs/ingenuity/LoadSubpatchWindow.cpp b/src/progs/ingenuity/LoadSubpatchWindow.cpp index 07b51716..453d874e 100644 --- a/src/progs/ingenuity/LoadSubpatchWindow.cpp +++ b/src/progs/ingenuity/LoadSubpatchWindow.cpp @@ -138,8 +138,7 @@ LoadSubpatchWindow::ok_clicked() const string filename = get_filename(); - // FIXME - string name = filename.substr(filename.find_last_of("/")+1); + string name = ""; int poly = 1; if (m_name_from_user_radio->get_active()) @@ -150,17 +149,7 @@ LoadSubpatchWindow::ok_clicked() else if (m_poly_from_parent_radio->get_active()) poly = m_patch->poly(); - /*CountedPtr<PatchModel> pm(new PatchModel(m_patch->path().base() + name, poly)); - pm->filename(filename); - - pm->set_metadata("module-x", Atom((float)m_new_module_x)); - pm->set_metadata("module-y", Atom((float)m_new_module_y)); - - 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; + App::instance().loader()->load_patch(filename, m_patch->path(), name, poly, m_initial_data); hide(); } |