From 76466bde179e9b0d58b1586fb3f4ed40dedbdc13 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Mon, 18 Aug 2008 06:26:24 +0000 Subject: Fix loading / importing patches at root and in subpatches. git-svn-id: http://svn.drobilla.net/lad/ingen@1430 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/gui/PatchCanvas.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/libs/gui/PatchCanvas.cpp') diff --git a/src/libs/gui/PatchCanvas.cpp b/src/libs/gui/PatchCanvas.cpp index 135a28c8..2ea4496c 100644 --- a/src/libs/gui/PatchCanvas.cpp +++ b/src/libs/gui/PatchCanvas.cpp @@ -58,7 +58,9 @@ PatchCanvas::PatchCanvas(SharedPtr patch, int width, int height) , _last_click_x(0) , _last_click_y(0) , _refresh_menu(false) + , _menu(NULL) , _internal_menu(NULL) + , _plugin_menu(NULL) { Glib::RefPtr xml = GladeFactory::new_glade_reference(); xml->get_widget("canvas_menu", _menu); @@ -590,7 +592,7 @@ PatchCanvas::paste() ClashAvoider avoider(*App::instance().store().get(), _patch->path(), clipboard); //parser->parse_string(App::instance().world(), &avoider, str, _patch->path().base()); parser->parse_string(App::instance().world(), &avoider, str, "/", - boost::optional(), _patch->path()); + boost::optional(), (Glib::ustring)_patch->path()); for (Store::iterator i = clipboard.begin(); i != clipboard.end(); ++i) { if (_patch->path() == "/" && i->first == "/") { @@ -616,9 +618,13 @@ PatchCanvas::paste() builder.build(_patch->path(), i->second); } + //avoider.set_target(*App::instance().engine()); + for (ClientStore::ConnectionRecords::const_iterator i = clipboard.connection_records().begin(); - i != clipboard.connection_records().end(); ++i) + i != clipboard.connection_records().end(); ++i) { + cout << "CONNECTING " << i->first << " -> " << i->second << endl; App::instance().engine()->connect(i->first, i->second); + } } -- cgit v1.2.1