diff options
| author | David Robillard <d@drobilla.net> | 2011-03-15 19:08:52 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-03-15 19:08:52 +0000 |
| commit | 4770234867a084ae21534a5f237efaaeb832c68c (patch) | |
| tree | 8a64d66cf19bea67015396e06fb010e2b81ade52 | |
| parent | f22e0bb610cea9e8471f7e5b0b704d8b282f239d (diff) | |
| download | ingen-4770234867a084ae21534a5f237efaaeb832c68c.tar.gz ingen-4770234867a084ae21534a5f237efaaeb832c68c.tar.bz2 ingen-4770234867a084ae21534a5f237efaaeb832c68c.zip | |
Activate Jack after loading GUI.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@3090 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/gui/ConnectWindow.cpp | 4 | ||||
| -rw-r--r-- | src/ingen/main.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/ConnectWindow.cpp b/src/gui/ConnectWindow.cpp index 5faa2248..9e1a33b4 100644 --- a/src/gui/ConnectWindow.cpp +++ b/src/gui/ConnectWindow.cpp @@ -76,8 +76,10 @@ ConnectWindow::start(Ingen::Shared::World* world) { if (world->local_engine()) { _mode = INTERNAL; - if (_widgets_loaded) + if (_widgets_loaded) { _internal_radio->set_active(true); + } + world->local_engine()->activate(); } set_connected_to(world->engine()); diff --git a/src/ingen/main.cpp b/src/ingen/main.cpp index 1407dfda..0f4339fd 100644 --- a/src/ingen/main.cpp +++ b/src/ingen/main.cpp @@ -153,8 +153,6 @@ main(int argc, char** argv) if (world->local_engine()) { ingen_try(world->load("ingen_jack"), "Unable to load jack module"); - - world->local_engine()->activate(); } world->set_engine(engine_interface); @@ -219,6 +217,7 @@ main(int argc, char** argv) } else if (world->local_engine() && !conf.option("gui").get_bool()) { signal(SIGINT, ingen_interrupt); signal(SIGTERM, ingen_interrupt); + world->local_engine()->activate(); world->local_engine()->main(); // Block here } |