diff options
| author | Robin Gareus <robin@gareus.org> | 2015-01-05 02:15:19 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-01-05 02:15:19 +0100 |
| commit | 274522b1a4cb67de96edf9f1c2c198362862e99b (patch) | |
| tree | 2849db22410267dea4dd8314282a1ec3fb780651 /gtk2_ardour | |
| parent | 041b729de72b9dd77937dffa5b78f5b0fd7d7976 (diff) | |
windows packaging: project agnostic names & registy
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/bundle_env_mingw.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/video_tool_paths.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/bundle_env_mingw.cc b/gtk2_ardour/bundle_env_mingw.cc index 2eb98f88a5..c4e14c2081 100644 --- a/gtk2_ardour/bundle_env_mingw.cc +++ b/gtk2_ardour/bundle_env_mingw.cc @@ -58,9 +58,9 @@ get_install_path () char tmp[PATH_MAX+1]; if ( #ifdef __MINGW64__ - (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\Ardour\\ardour3\\w64", 0, KEY_READ, &key)) + (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\w64", 0, KEY_READ, &key)) #else - (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\Ardour\\ardour3\\w32", 0, KEY_READ, &key)) + (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\w32", 0, KEY_READ, &key)) #endif &&(ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size)) ) diff --git a/gtk2_ardour/video_tool_paths.cc b/gtk2_ardour/video_tool_paths.cc index 5cbbda769f..5b8f0725ca 100644 --- a/gtk2_ardour/video_tool_paths.cc +++ b/gtk2_ardour/video_tool_paths.cc @@ -76,7 +76,7 @@ ArdourVideoToolPaths::harvid_exe (std::string &harvid_exe) harvid_exe = icsd_file_path; } #ifdef PLATFORM_WINDOWS - else if ( windows_install_dir("Software\\Ardour\\video", reg)) + else if ( windows_install_dir("Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\video", reg)) { harvid_exe = g_build_filename(reg.c_str(), "harvid", "harvid.exe", NULL); } @@ -123,7 +123,7 @@ ArdourVideoToolPaths::xjadeo_exe (std::string &xjadeo_exe) } #endif #ifdef PLATFORM_WINDOWS - else if ( windows_install_dir("Software\\Ardour\\video", reg)) + else if ( windows_install_dir("Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\video", reg)) { xjadeo_exe = std::string(g_build_filename(reg.c_str(), "xjadeo", "xjadeo.exe", NULL)); } @@ -162,7 +162,7 @@ ArdourVideoToolPaths::transcoder_exe (std::string &ffmpeg_exe, std::string &ffpr ffmpeg_exe = ff_file_path; } #ifdef PLATFORM_WINDOWS - else if ( windows_install_dir("Software\\Ardour\\video", reg)) + else if ( windows_install_dir("Software\\" PROGRAM_NAME "\\v" PROGRAM_VERSION "\\video", reg)) { ffmpeg_exe = g_build_filename(reg.c_str(), X_("harvid"), X_("ffmpeg.exe"), NULL); ffprobe_exe = g_build_filename(reg.c_str(), X_("harvid"), X_("ffprobe.exe"), NULL); |