From 9e489c20da1c5da772ac907a8adeb7b06ec19290 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 4 May 2015 19:08:48 +0200 Subject: [PATCH] further preparations for NSM (#6265) --- gtk2_ardour/ardour_ui.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ecdb549fd6..71901437c2 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -803,13 +803,16 @@ ARDOUR_UI::starting () if ((nsm_url = g_getenv ("NSM_URL")) != 0) { nsm = new NSM_Client; if (!nsm->init (nsm_url)) { - /* TODO this needs fixing! + /* the ardour executable may have different names: + * * waf's obj.target for distro versions: eg ardour4, ardourvst4 * Ardour4, Mixbus3 for bundled versions + full path on OSX & windows * argv[0] does not apply since we need the wrapper-script (not the binary itself) - * No idea how to address all these. + * + * The wrapper startup script should set the environment variable 'ARDOUR_SELF' */ - nsm->announce (PROGRAM_NAME, ":dirty:", "ardour4"); + const char *process_name = g_getenv ("ARDOUR_SELF"); + nsm->announce (PROGRAM_NAME, ":dirty:", process_name ? process_name : "ardour4"); unsigned int i = 0; // wait for announce reply from nsm server