merge with master and fix 4 conflicts by hand

[ardour.git] / gtk2_ardour / video_server_dialog.cc

diff --git a/gtk2_ardour/video_server_dialog.cc b/gtk2_ardour/video_server_dialog.cc
index 2f22065a10dce8685bc0abf65262172fb4f8c13e..add7ea42de8dd22224d8fb5c4152190f8acb44a2 100644 (file)
--- a/gtk2_ardour/video_server_dialog.cc
+++ b/gtk2_ardour/video_server_dialog.cc
@@ -29,10 +29,24 @@
 #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
+
 #include "video_server_dialog.h"
 #include "utils_videotl.h"
 #include "i18n.h"
 
+#ifdef PLATFORM_WINDOWS
+#include <windows.h>
+#endif
+
 using namespace Gtk;
 using namespace std;
 using namespace PBD;
@@ -79,10 +93,30 @@ VideoServerDialog::VideoServerDialog (Session* s)
        listenaddr_combo.append_text("0.0.0.0");
        listenaddr_combo.set_active(0);
 
+#ifdef PLATFORM_WINDOWS
+       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;
-       if (find_file_in_search_path (PBD::SearchPath(Glib::getenv("PATH")), X_("harvid"), icsd_file_path)) {
+       if (find_file_in_search_path (PBD::Searchpath(Glib::getenv("PATH")), X_("harvid"), icsd_file_path)) {
                path_entry.set_text(icsd_file_path);
        }
+#ifdef PLATFORM_WINDOWS
+       else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\harvid", 0, KEY_READ, &key))
+                       &&  (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
+                       )
+       {
+               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"));
        }