diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-01 16:46:00 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-02-01 16:46:00 +0000 |
| commit | dbae21f78c22462879d1b476db2778485eeaab48 (patch) | |
| tree | f3fa1d9174467949c87e963a2cd21bd8b5ac5031 /gtk2_ardour/engine_dialog.cc | |
| parent | f8c2227714826d882c7999673659a9123707046d (diff) | |
fix up use of PATH when finding JACK (and startign it) so that new OS X users who have installed JACK in /usr/local but have not set PATH do not crash and burn; hide splash when most MessageDialog's appear
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2986 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/engine_dialog.cc')
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index 0eaff9ed1f..637febcd94 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -553,10 +553,12 @@ EngineControl::setup_engine () error << string_compose (_("cannot open JACK rc file %1 to store parameters"), jackdrc_path) << endmsg; return -1; } - + cerr << "JACK COMMAND: "; for (vector<string>::iterator i = args.begin(); i != args.end(); ++i) { + cerr << (*i) << ' '; jackdrc << (*i) << ' '; } + cerr << endl; jackdrc << endl; jackdrc.close (); @@ -956,6 +958,12 @@ EngineControl::find_jack_servers (vector<string>& strings) } } +#ifdef __APPLE__ + // push it back into the environment so that auto-started JACK can find it. + // XXX why can't we just expect OS X users to have PATH set correctly? we can't ... + setenv ("PATH", path.c_str(), 1); +#endif + jack_servers = scanner (path, jack_server_filter, 0, false, true); vector<string *>::iterator iter; |