add const_cast to avoid compiler warnings from apple gcc

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 815d19b7e782cce95b799c85cad77226d3f47814..a1dd4bcfbbc89edaa03078c2886e3c7798703ed9 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -25,18 +25,13 @@
 #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"
 #include "utils_videotl.h"
 #include "rgb_macros.h"
 #include "video_timeline.h"
+#include "video_tool_paths.h"
 
 #include <gtkmm2ext/utils.h>
 #include <pthread.h>
@@ -90,7 +85,7 @@ VideoTimeLine::save_session ()
                return;
        }
 
-       LocaleGuard lg (X_("POSIX"));
+       LocaleGuard lg (X_("C"));
 
        XMLNode* node = new XMLNode(X_("Videomonitor"));
        if (!node) return;
@@ -147,8 +142,8 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
        SessionHandlePtr::set_session (s);
        if (!_session) { return ; }
 
-       _session->SaveSession.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
-       LocaleGuard lg (X_("POSIX"));
+       _session->SessionSaveUnderway.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
+       LocaleGuard lg (X_("C"));
 
        XMLNode* node = _session->extra_xml (X_("Videotimeline"));
 
@@ -229,7 +224,7 @@ VideoTimeLine::save_undo ()
 int
 VideoTimeLine::set_state (const XMLNode& node, int /*version*/)
 {
-       LocaleGuard lg (X_("POSIX"));
+       LocaleGuard lg (X_("C"));
        const XMLProperty* propoffset = node.property (X_("VideoOffset"));
        if (propoffset) {
                video_offset = atoll(propoffset->value());
@@ -242,7 +237,7 @@ XMLNode&
 VideoTimeLine::get_state ()
 {
        XMLNode* node = new XMLNode (X_("Videotimeline"));
-       LocaleGuard lg (X_("POSIX"));
+       LocaleGuard lg (X_("C"));
        node->add_property (X_("VideoOffset"), video_offset_p);
        return *node;
 }
@@ -361,16 +356,20 @@ VideoTimeLine::update_video_timeline()
        vtl_start -= visible_video_frames * vtl_dist;
        visible_video_frames *=3;
 
-       if (vtl_start < video_offset ) {
-               visible_video_frames += ceil((double)vtl_start/vtl_dist);
+       /* don't request frames that are too far to the right */
+       if (vtl_start < video_offset) {
+               visible_video_frames = std::max((double)0.0, (double)visible_video_frames + ceil((double)(vtl_start - video_offset)/vtl_dist));
                vtl_start = video_offset;
        }
 
-       /* apply video-file constraints */
+       /* apply video-file constraints
+        * (first frame in video is at video_start_offset) */
        if (vtl_start > video_start_offset + video_duration + video_offset ) {
                visible_video_frames = 0;
        }
-       /* TODO optimize: compute rather than iterate */
+       /* trim end.
+        * end = position on timeline (video-offset)  minus  video-file's first frame position
+        * TODO optimize: compute rather than iterate */
        while (visible_video_frames > 0 && vtl_start + (visible_video_frames-1) * vtl_dist >= video_start_offset + video_duration + video_offset) {
                --visible_video_frames;
        }
@@ -725,48 +724,7 @@ VideoTimeLine::xjadeo_readversion (std::string d, size_t /* s */) {
 
 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 = getenv("XJREMOTE");
-       } else if (find_file (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");
-       }
-#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_("");
+       if (!ArdourVideoToolPaths::xjadeo_exe(_xjadeo_bin)) {
                warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
                                "(a custom path to xjadeo can be specified by setting the XJREMOTE environment variable. "
                                "It should point to an application compatible with xjadeo's remote-control interface 'xjremote').\n"
@@ -774,6 +732,7 @@ VideoTimeLine::find_xjadeo () {
                                "see also http://manual.ardour.org/video-timeline/setup/")
                        << endmsg;
        }
+
        if (found_xjadeo ()) {
                ARDOUR::SystemExec version_check(_xjadeo_bin, X_("--version"));
                xjadeo_version = "";