diff options
| author | David Robillard <d@drobilla.net> | 2007-09-24 04:52:21 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-09-24 04:52:21 +0000 |
| commit | 97faa683045e44563d25befe463e76f42c7d1a9b (patch) | |
| tree | 1d1a476ee29075d835af8add80435c06bdcc9a20 /src/libs/gui/ConnectWindow.cpp | |
| parent | 5b706499e0a2ad3056afd2f9db1487ad169ec059 (diff) | |
| download | ingen-97faa683045e44563d25befe463e76f42c7d1a9b.tar.gz ingen-97faa683045e44563d25befe463e76f42c7d1a9b.tar.bz2 ingen-97faa683045e44563d25befe463e76f42c7d1a9b.zip | |
Avoid thread creation and glade stuff on module/port creation (defer until menu requested).
git-svn-id: http://svn.drobilla.net/lad/ingen@776 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/gui/ConnectWindow.cpp')
| -rw-r--r-- | src/libs/gui/ConnectWindow.cpp | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/src/libs/gui/ConnectWindow.cpp b/src/libs/gui/ConnectWindow.cpp index e61b72d8..e8f93354 100644 --- a/src/libs/gui/ConnectWindow.cpp +++ b/src/libs/gui/ConnectWindow.cpp @@ -112,21 +112,19 @@ ConnectWindow::start(SharedPtr<Ingen::Engine> engine, SharedPtr<Shared::EngineIn if (engine) { - engine->activate(1); // FIXME - Glib::signal_timeout().connect( sigc::mem_fun(engine.get(), &Ingen::Engine::main_iteration), 1000); ThreadedSigClientInterface* tsci = new ThreadedSigClientInterface(Ingen::event_queue_size); SharedPtr<SigClientInterface> client(tsci); + Glib::signal_timeout().connect( + sigc::mem_fun(tsci, &ThreadedSigClientInterface::emit_signals), 10, G_PRIORITY_HIGH_IDLE); + if (interface) App::instance().attach(interface, client); - + _connect_stage = 0; - - Glib::signal_timeout().connect( - sigc::mem_fun(tsci, &ThreadedSigClientInterface::emit_signals), 10, G_PRIORITY_HIGH_IDLE); } if (interface) { @@ -243,7 +241,7 @@ ConnectWindow::connect() assert(_new_engine); _engine = SharedPtr<Ingen::Engine>(_new_engine(App::instance().world())); - _engine->start_jack_driver(); + //_engine->start_jack_driver(); SharedPtr<Ingen::EngineInterface> engine_interface = _engine->new_queued_interface(); @@ -252,16 +250,16 @@ ConnectWindow::connect() App::instance().attach(engine_interface, client); - _engine->activate(1); // FIXME + /*_engine->activate(1); // FIXME Glib::signal_timeout().connect( - sigc::mem_fun(_engine.get(), &Ingen::Engine::main_iteration), 1000); + sigc::mem_fun(_engine.get(), &Ingen::Engine::main_iteration), 1000);*/ Glib::signal_timeout().connect( sigc::mem_fun(this, &ConnectWindow::gtk_callback), 100); - Glib::signal_timeout().connect( - sigc::mem_fun(tsci, &ThreadedSigClientInterface::emit_signals), 10, G_PRIORITY_HIGH_IDLE); + /*Glib::signal_timeout().connect( + sigc::mem_fun(tsci, &ThreadedSigClientInterface::emit_signals), 10, G_PRIORITY_HIGH_IDLE);*/ } } |