diff options
| -rw-r--r-- | gtk2_ardour/video_server_dialog.cc | 12 | ||||
| -rw-r--r-- | gtk2_ardour/video_timeline.cc | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc index f9a50821b5..e4c9a7f51a 100644 --- a/gtk2_ardour/video_server_dialog.cc +++ b/gtk2_ardour/video_server_dialog.cc @@ -29,6 +29,12 @@ #include "ardour/template_utils.h" #include "ardour/session.h" +#ifdef PLATFORM_WINDOWS +#include <windows.h> +#include <shlobj.h> // CSIDL_* +#include "pbd/windows_special_dirs.h" +#endif + #ifdef interface #undef interface #endif @@ -87,6 +93,7 @@ VideoServerDialog::VideoServerDialog (Session* s) HKEY key; DWORD size = PATH_MAX; char tmp[PATH_MAX+1]; + const char *program_files = PBD::get_win_special_folder (CSIDL_PROGRAM_FILES); #endif std::string icsd_file_path; @@ -100,7 +107,12 @@ VideoServerDialog::VideoServerDialog (Session* s) { path_entry.set_text(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "harvid.exe", 0)); } + else if (program_files && Glib::file_test(g_build_filename(program_files, "harvid", "harvid.exe", 0), Glib::FILE_TEST_EXISTS)) + { + path_entry.set_text(g_build_filename(program_files, "harvid", "harvid.exe", 0)); + } #endif + /* generic fallbacks to try */ else if (Glib::file_test(X_("C:\\Program Files\\harvid\\harvid.exe"), Glib::FILE_TEST_EXISTS)) { path_entry.set_text(X_("C:\\Program Files\\harvid\\harvid.exe")); } diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index 0ef0f4c5d8..0defa56be7 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -25,6 +25,12 @@ #include "pbd/convert.h" #include "ardour/session_directory.h" +#ifdef PLATFORM_WINDOWS +#include <windows.h> +#include <shlobj.h> // CSIDL_* +#include "pbd/windows_special_dirs.h" +#endif + #include "ardour_ui.h" #include "public_editor.h" #include "gui_thread.h" @@ -720,6 +726,7 @@ VideoTimeLine::find_xjadeo () { HKEY key; DWORD size = PATH_MAX; char tmp[PATH_MAX+1]; + const char *program_files = PBD::get_win_special_folder (CSIDL_PROGRAM_FILES); #endif if (getenv("XJREMOTE")) { _xjadeo_bin = getenv("XJREMOTE"); @@ -740,7 +747,12 @@ VideoTimeLine::find_xjadeo () { { _xjadeo_bin = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", 0)); } + else if (program_files && Glib::file_test(g_build_filename(program_files, "xjadeo", "xjadeo.exe", 0), Glib::FILE_TEST_EXISTS)) + { + _xjadeo_bin = std::string(g_build_filename(program_files, "harvid", "xjadeo.exe", 0)); + } #endif + /* generic fallbacks to try */ #ifdef __APPLE__ else if (Glib::file_test(X_("/Applications/Jadeo.app/Contents/MacOS/xjremote"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) { _xjadeo_bin = X_("/Applications/Jadeo.app/Contents/MacOS/xjremote"); |