diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-05 12:51:51 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-05 12:51:51 -0400 |
| commit | a66e3859e1415cb992320089004eb8a9903cf721 (patch) | |
| tree | f93b5f05ccf26e6b91ed0a2b99a5d8603cc73131 /gtk2_ardour/ardour_ui.cc | |
| parent | 7218bd91de3b69032e515617449702f368db59d2 (diff) | |
can now start JACK based on config dialog
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index fca86c585b..c4e037a5bf 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -490,17 +490,6 @@ ARDOUR_UI::post_engine () Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context()); boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1)); Config->map_parameters (pc); - - /* now start and maybe save state */ - - if (do_engine_start () == 0) { - if (_session && _session_is_new) { - /* we need to retain initial visual - settings for a new session - */ - _session->save_state (""); - } - } } ARDOUR_UI::~ARDOUR_UI () @@ -2035,7 +2024,8 @@ ARDOUR_UI::engine_stopped () void ARDOUR_UI::engine_running () { - ENSURE_GUI_THREAD (*this, &ARDOUR_UI::engine_running) + post_engine(); + ActionManager::set_sensitive (ActionManager::jack_sensitive_actions, true); ActionManager::set_sensitive (ActionManager::jack_opposite_sensitive_actions, false); @@ -2127,24 +2117,6 @@ JACK, reconnect and save the session."), PROGRAM_NAME); } } -int32_t -ARDOUR_UI::do_engine_start () -{ - try { - engine->start(); - } - - catch (...) { - engine->stop (); - error << _("Unable to start the session running") - << endmsg; - unload_session (); - return -2; - } - - return 0; -} - void ARDOUR_UI::update_clocks () { |