try get_win_special_folder() for harvid & xjadeo (if registry fails)

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index a1a85a02439e785dcec93f71370b70904fa2cba2..0defa56be7a3448ec215de34af7c126cab81d3a5 100644 (file)
--- 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"
@@ -347,17 +353,17 @@ VideoTimeLine::update_video_timeline()
        assert (vtl_dist > 0);
        assert (apv > 0);
 
-       leftmost_video_frame = floor (floor((leftmost_sample - video_start_offset - video_offset ) / vtl_dist) * vtl_dist / apv);
+       leftmost_video_frame = floor (floor((long double)(leftmost_sample - video_start_offset - video_offset ) / vtl_dist) * vtl_dist / apv);
 
        vtl_start = rint (video_offset + video_start_offset + leftmost_video_frame * apv);
-       visible_video_frames = 2 + ceil(editor->current_page_samples() / vtl_dist); /* +2 left+right partial frames */
+       visible_video_frames = 2 + ceil((double)editor->current_page_samples() / vtl_dist); /* +2 left+right partial frames */
 
        /* expand timeline (cache next/prev page images) */
        vtl_start -= visible_video_frames * vtl_dist;
        visible_video_frames *=3;
 
        if (vtl_start < video_offset ) {
-               visible_video_frames += ceil(vtl_start/vtl_dist);
+               visible_video_frames += ceil((double)vtl_start/vtl_dist);
                vtl_start = video_offset;
        }
 
@@ -452,7 +458,8 @@ VideoTimeLine::video_file_info (std::string filename, bool local)
 {
 
        local_file = local;
-       if (filename.at(0) == G_DIR_SEPARATOR || !local_file) {
+       if (Glib::path_is_absolute(filename) || !local_file)
+       {
                video_filename = filename;
        }  else {
                video_filename = Glib::build_filename (_session->session_directory().video_path(), filename);
@@ -583,7 +590,7 @@ VideoTimeLine::check_server_docroot ()
                        || lines.at(0).empty()
                        || lines.at(0).at(0) != video_get_docroot(Config)) {
                warning << string_compose(
-                               _("Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually means that the video server was not started by ardour and uses a different document-root."),
+                               _("Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually means that the video server was not started by %1 and uses a different document-root."),
                                PROGRAM_NAME, video_get_docroot(Config), lines.at(0).at(0))
                << endmsg;
                ok = false; // TODO allow to override
@@ -715,20 +722,44 @@ VideoTimeLine::set_video_server_docroot(std::string vsr) {
 void
 VideoTimeLine::find_xjadeo () {
        std::string xjadeo_file_path;
+#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
        if (getenv("XJREMOTE")) {
-               _xjadeo_bin = strdup(getenv("XJREMOTE")); // XXX TODO: free it?!
-       } else if (find_file_in_search_path (SearchPath(Glib::getenv("PATH")), X_("xjremote"), xjadeo_file_path)) {
+               _xjadeo_bin = getenv("XJREMOTE");
+       } else if (find_file_in_search_path (Searchpath(Glib::getenv("PATH")), X_("xjremote"), xjadeo_file_path)) {
                _xjadeo_bin = xjadeo_file_path;
        }
+#ifdef PLATFORM_WINDOWS
+       /* old xjadeo, typo in key <= 0.7.6 */
+       else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSSxjadeo", 0, KEY_READ, &key))
+                       &&  (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
+                       )
+       {
+               _xjadeo_bin = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", 0));
+       }
+       else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\xjadeo", 0, KEY_READ, &key))
+                       &&  (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
+                       )
+       {
+               _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");
        }
-       /* TODO: win32: allow to configure PATH to xjremote */
-       else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjremote.exe"), Glib::FILE_TEST_EXISTS)) {
-               _xjadeo_bin = X_("C:\\Program Files\\xjadeo\\xjremote.exe");
-       }
-       else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjremote.bat"), Glib::FILE_TEST_EXISTS)) {
-               _xjadeo_bin = X_("C:\\Program Files\\xjadeo\\xjremote.bat");
+#endif
+       else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjadeo.exe"), Glib::FILE_TEST_EXISTS)) {
+               _xjadeo_bin = X_("C:\\Program Files\\xjadeo\\xjadeo.exe");
        }
        else  {
                _xjadeo_bin = X_("");