diff options
| author | Robin Gareus <robin@gareus.org> | 2014-04-24 13:22:17 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-04-24 13:22:17 +0200 |
| commit | 9f266e90611f8bb713f74c9f745b9b1c83d316c1 (patch) | |
| tree | 0f111409845e188ab76384cc4a06b6c9af3d3069 /gtk2_ardour/video_server_dialog.cc | |
| parent | 1929cbffb4230dc4f7eb458f8fbe00974c784a59 (diff) | |
try get_win_special_folder() for harvid & xjadeo (if registry fails)
Diffstat (limited to 'gtk2_ardour/video_server_dialog.cc')
| -rw-r--r-- | gtk2_ardour/video_server_dialog.cc | 12 |
1 files changed, 12 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")); } |