projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
59067d3
)
further preparations for NSM (#6265)
author
Robin Gareus
<robin@gareus.org>
Mon, 4 May 2015 17:08:48 +0000
(19:08 +0200)
committer
Robin Gareus
<robin@gareus.org>
Mon, 4 May 2015 17:08:48 +0000
(19:08 +0200)
gtk2_ardour/ardour_ui.cc
patch
|
blob
|
history
diff --git
a/gtk2_ardour/ardour_ui.cc
b/gtk2_ardour/ardour_ui.cc
index ecdb549fd639e60eae9ecd88abe06ccf1df0e366..71901437c2fe50fba90d053b2ccea91ed7c32444 100644
(file)
--- 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)) {
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)
* 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
unsigned int i = 0;
// wait for announce reply from nsm server