smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-08 15:54:57 +01:00
Code Issues Projects Releases Wiki Activity

Another approach for stuck splash-screens:

Browse source 
Use Editor::first_idle() which is invoked every time when a session
is loaded (via set_session). This will catch ALL successful
session loads.

Failed session-loads explicitly pop down the splash in
ARDOUR_UI::load_session.

This only leaves "abort session open" which returns to the
session-open dialog (which pops back the splash).
This commit is contained in:
Robin Gareus 2017-07-03 16:19:10 +02:00
parent ddf55c0d88
commit 54aa82cd4b
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
gtk2_ardour/ardour_ui.cc
View file

@ -1284,11 +1284,6 @@ ARDOUR_UI::starting ()
BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME)); BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
if (splash) {
// in 1 second, hide the splash screen
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
}
/* all other dialogs are created conditionally */ /* all other dialogs are created conditionally */
return 0; return 0;
@ -1929,10 +1924,6 @@ ARDOUR_UI::open_recent_session ()
can_return = false; can_return = false;
} }
if (splash) {
// in 1 second, hide the splash screen
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
}
} }
bool bool
@ -2848,7 +2839,6 @@ ARDOUR_UI::save_session_as ()
if (!sa.include_media && sa.switch_to) { if (!sa.include_media && sa.switch_to) {
unload_session (false); unload_session (false);
load_session (sa.final_session_folder_name, sa.new_name); load_session (sa.final_session_folder_name, sa.new_name);
hide_splash ();
} }
} }
@ -3604,10 +3594,6 @@ ARDOUR_UI::close_session()
if (get_session_parameters (true, false)) { if (get_session_parameters (true, false)) {
exit (1); exit (1);
} }
if (splash && splash->is_visible()) {
// in 1 second, hide the splash screen
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
}
} }
/** @param snap_name Snapshot name (without .ardour suffix). /** @param snap_name Snapshot name (without .ardour suffix).
@ -3775,6 +3761,14 @@ ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name,
retval = 0; retval = 0;
out: out:
/* For successful session load the splash is hidden by ARDOUR_UI::first_idle,
* which is queued by set_session().
* If session-loading fails we hide it explicitly.
* This covers both cases in a central place.
*/
if (retval) {
hide_splash ();
}
return retval; return retval;
} }
@ -5202,6 +5196,15 @@ ARDOUR_UI::first_idle ()
editor->first_idle(); editor->first_idle();
} }
/* in 1 second, hide the splash screen
*
* Consider hiding it *now*. If a user opens opens a dialog
* during that one second while the splash is still visible,
* the dialog will push-back the splash.
* Closing the dialog later will pop it back.
*/
Glib::signal_timeout().connect (sigc::bind (sigc::ptr_fun (_hide_splash), this), 1000);
Keyboard::set_can_save_keybindings (true); Keyboard::set_can_save_keybindings (true);
return false; return false;
} }