ardour/livetrax
13
0
Fork 0
Code

Update jackd.exe registry key

Browse Source 
This ensures compatibility with upcoming jack > 1.9.16,
current jack 1.9.16, as well as older versions.
This commit is contained in:
Robin Gareus 2020-11-09 20:06:49 +01:00
parent 1d14b1cfba
commit bb468ee4de
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/backends/jack/jack_utils.cc
View File

@ -556,7 +556,16 @@ ARDOUR::get_jack_server_dir_paths (vector<std::string>& server_dir_paths)
#ifdef PLATFORM_WINDOWS
std::string reg;
bool found = PBD::windows_query_registry ("Software\\JACK", "Location", reg);
/* since https://github.com/jackaudio/jack2/commit/ac62faa9c0268b89e3ea23c0318227612acd8079 */
bool found = PBD::windows_query_registry ("Software\\JACK", "InstallPath", reg);
if (!found) {
/* special-case jack 1.9.16, "Location" included jackd.exe */
found = PBD::windows_query_registry ("Software\\JACK", "Location", reg);
if (found) {
reg = Glib::path_get_dirname (reg);
}
}
if (!found) {
// If the newer style regkey wasn't found, check for one in the older style...
found = PBD::windows_query_registry ("Software\\Jack", "InstPath", reg, HKEY_CURRENT_USER);