From 7f4e9fe211c1ec837b8159eeaa691b593784ab6c Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 9 Oct 2019 20:53:03 -0600 Subject: [PATCH] NSM startup needs to call a different method due to API changes --- gtk2_ardour/nsm.cc | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gtk2_ardour/nsm.cc b/gtk2_ardour/nsm.cc index acbc7529d0..1f2aa5a5da 100644 --- a/gtk2_ardour/nsm.cc +++ b/gtk2_ardour/nsm.cc @@ -17,15 +17,15 @@ /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /*******************************************************************************/ +#include +#include + +#include "gtkmm2ext/application.h" #include "nsm.h" #include "opts.h" #include "ardour_ui.h" -#include -#include - - NSM_Client::NSM_Client() { } @@ -49,11 +49,13 @@ NSM_Client::command_open(const char* name, { int r = ERR_OK; - ARDOUR_COMMAND_LINE::session_name = name; ARDOUR_COMMAND_LINE::backend_client_name = client_id; - if (ARDOUR_UI::instance()->get_session_parameters(true, false, "")) { - return ERR_GENERAL; - } + /* this appears asynchronous, but almost certainly is + synchronous. However, there's no return value available. + */ + + Gtkmm2ext::Application::instance()->ShouldLoad (name); + return r; }