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

cleanup and recomment StartupFSM::load_from_application_api()

Browse source
This commit is contained in:
Paul Davis 2019-12-14 10:27:44 -07:00
parent 346c2ee3fe
commit 38f692f0c0
1 changed files with 5 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

48
gtk2_ardour/startup_fsm.cc
View file

@ -812,55 +812,17 @@ StartupFSM::copy_demo_sessions ()
void void
StartupFSM::load_from_application_api (const std::string& path) StartupFSM::load_from_application_api (const std::string& path)
{ {
/* macOS El Capitan (and probably later) now somehow passes the command
line arguments to an app via the openFile delegate protocol. Ardour
already does its own command line processing, and having both
pathways active causes crashes. So, if the command line was already
set, do nothing here.
*/
if (!ARDOUR_COMMAND_LINE::session_name.empty()) { if (!ARDOUR_COMMAND_LINE::session_name.empty()) {
return; return;
} }
/* Cancel SessionDialog if it's visible to make macOS delegates work. /* just set this as if it was given on the command line, rather than
* * supplied via some desktop system (e.g. macOS application delegate
* there's a race condition here: we connect to app->ShouldLoad * and "openFile". Note that this relies on this being invoked before
* and then at some point (might) show a session dialog. The race is * StartupFSM::start().
* caused by the non-deterministic interaction between the macOS event
* loop(s) and the GDK one(s).
*
* - ShouldLoad does not arrive before we show the session dialog
* -> here we should hide the session dialog, then use the
* supplied path as if it was provided on the command line
* - ShouldLoad signal arrives before we show a session dialog
* -> don't bother showing the session dialog, just use the
* supplied path as if it was provided on the command line
*
*/ */
if (session_dialog) { ARDOUR_COMMAND_LINE::session_name = path;
session_dialog->hide ();
delete_when_idle (session_dialog);
session_dialog = 0;
}
/* no command line argument given ... must just be via
* desktop/finder/window manager API (e.g. double click on "foo.ardour"
* icon)
*/
if (get_session_parameters_from_path (path, string(), false)) {
_signal_response (LoadSession);
return;
}
/* given parameters failed for some reason. This is probably true
* anyway, but force it to be true and then carry on with whatever the
* main event loop is doing.
*/
set_state (WaitingForSessionPath);
} }
bool bool