diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2019-10-24 21:13:08 -0600 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2019-10-24 21:32:46 -0600 |
| commit | eeb57bfef18683480fa57c3c5c33f01a1f772358 (patch) | |
| tree | dc5658ee0bef0cca8dfff7d410d2a5d241d9dd3c /gtk2_ardour/ardour_ui_startup.cc | |
| parent | f92561139509a8dd7ef093321197e38a8a847cd8 (diff) | |
clean up use of startupFSM
Diffstat (limited to 'gtk2_ardour/ardour_ui_startup.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_startup.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gtk2_ardour/ardour_ui_startup.cc b/gtk2_ardour/ardour_ui_startup.cc index e321c6fe38..a56b1a38e2 100644 --- a/gtk2_ardour/ardour_ui_startup.cc +++ b/gtk2_ardour/ardour_ui_startup.cc @@ -62,6 +62,7 @@ #include "ambiguous_file_dialog.h" #include "ardour_ui.h" +#include "debug.h" #include "engine_dialog.h" #include "keyboard.h" #include "missing_file_dialog.h" @@ -452,21 +453,23 @@ ARDOUR_UI::nsm_init () void ARDOUR_UI::sfsm_response (StartupFSM::Result r) { - std::cerr << "sfsm::R (" << r << ")\n"; + DEBUG_TRACE (DEBUG::GuiStartup, string_compose (X_("startup FSM response %1\n"), r)); + switch (r) { case StartupFSM::ExitProgram: - cerr << "ExitProgram\n"; queue_finish (); break; + case StartupFSM::LoadSession: - cerr << "LoadSession\n"; - _initial_verbose_plugin_scan = false; + if (load_session_from_startup_fsm () == 0) { - startup_fsm->end(); delete startup_fsm; startup_fsm = 0; startup_done (); + } else { + startup_fsm->reset (); } + break; } } @@ -508,10 +511,6 @@ ARDOUR_UI::starting () */ startup_fsm->start (); - - if (startup_fsm && startup_fsm->brand_new_user()) { - _initial_verbose_plugin_scan = true; - } } return 0; |