diff options
| author | David Robillard <d@drobilla.net> | 2011-02-17 10:30:08 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-02-17 10:30:08 +0000 |
| commit | e668b8c846175f90cf22b456c5e5a4cc85410da4 (patch) | |
| tree | 613d2e37d4ef359d2f572bfc4bfd43e6acff43c7 /src/gui | |
| parent | 4c6269aeaf39f1a5c7473c22ff0417d50decfdc3 (diff) | |
| download | ingen-e668b8c846175f90cf22b456c5e5a4cc85410da4.tar.gz ingen-e668b8c846175f90cf22b456c5e5a4cc85410da4.tar.bz2 ingen-e668b8c846175f90cf22b456c5e5a4cc85410da4.zip | |
Jack session support for ingen.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2978 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/App.cpp | 7 | ||||
| -rw-r--r-- | src/gui/ThreadedLoader.cpp | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/App.cpp b/src/gui/App.cpp index 9c9864cb..28e72a5f 100644 --- a/src/gui/App.cpp +++ b/src/gui/App.cpp @@ -261,7 +261,7 @@ App::activity_port_destroyed(Port* port) bool App::animate() { - for (ActivityPorts::iterator i = _activity_ports.begin(); i != _activity_ports.end() ; ) { + for (ActivityPorts::iterator i = _activity_ports.begin(); i != _activity_ports.end(); ) { ActivityPorts::iterator next = i; ++next; @@ -300,7 +300,10 @@ App::gtk_main_iteration() return false; if (_world->local_engine()) { - _world->local_engine()->main_iteration(); + if (!_world->local_engine()->main_iteration()) { + Gtk::Main::quit(); + return false; + } } else { _enable_signal = false; _client->emit_signals(); diff --git a/src/gui/ThreadedLoader.cpp b/src/gui/ThreadedLoader.cpp index 10f1f8d6..2a9646e2 100644 --- a/src/gui/ThreadedLoader.cpp +++ b/src/gui/ThreadedLoader.cpp @@ -93,7 +93,8 @@ ThreadedLoader::load_patch(bool merge, // Filthy hack to load deprecated patches based on file extension if (document_uri.substr(document_uri.length()-3) == ".om") { _events.push_back(sigc::hide_return(sigc::bind( - sigc::mem_fun(_deprecated_loader, &DeprecatedLoader::load_patch), + sigc::mem_fun(_deprecated_loader, + &DeprecatedLoader::load_patch), document_uri, merge, engine_parent, @@ -102,7 +103,8 @@ ThreadedLoader::load_patch(bool merge, false))); } else { _events.push_back(sigc::hide_return(sigc::bind( - sigc::mem_fun(world->parser().get(), &Ingen::Serialisation::Parser::parse_document), + sigc::mem_fun(world->parser().get(), + &Ingen::Serialisation::Parser::parse_file), App::instance().world(), App::instance().world()->engine().get(), document_uri, |