From 34e7e2a6efe9aad5c01100b60268c8e732063427 Mon Sep 17 00:00:00 2001 From: sletz Date: Sun, 1 Feb 2009 08:54:10 +0000 Subject: [PATCH] Define a JACK_INTERNAL_DIR environment variable to be used for internal clients. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3286 0c269be4-1314-0410-8aa9-9f06e86f4224 --- ChangeLog | 4 ++++ common/JackInternalClient.cpp | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c6191b3..b87a78b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,10 @@ Michael Voigt Jackdmp changes log --------------------------- +2009-02-01 Stephane Letz + + * Add a JACK_INTERNAL_DIR environment variable to be used for internal clients. + 2009-01-30 Stephane Letz * In NetJack2, fix a bug when capture or playback only channels are used. diff --git a/common/JackInternalClient.cpp b/common/JackInternalClient.cpp index 569b4107..0c0977ad 100644 --- a/common/JackInternalClient.cpp +++ b/common/JackInternalClient.cpp @@ -74,10 +74,16 @@ static void PrintLoadError(const char* so_name) static void BuildClientPath(char* path_to_so, int path_len, const char* so_name) { - const char* driver_dir; - if ((driver_dir = getenv("JACK_DRIVER_DIR")) == 0) - driver_dir = ADDON_DIR; - snprintf(path_to_so, path_len, "%s/%s.so", driver_dir, so_name); + const char* internal_dir; + if ((internal_dir = getenv("JACK_INTERNAL_DIR")) == 0) { + if ((internal_dir = getenv("JACK_DRIVER_DIR")) == 0) { + internal_dir = ADDON_DIR; + } + } + + snprintf(path_to_so, path_len, "%s/%s.so", internal_dir, so_name); + + printf("internal_dir path_to_so %s %s\n", internal_dir, path_to_so); } #endif