son't try to select non-existent notes after editing (and thus crash).

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 0e58534772b064635ded225e109acc15565c22ea..3468ff2c705eaa53df763be105eaac17c49d7d02 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -26,6 +26,7 @@
 #include "ardour/session_directory.h"
 
 #include "ardour_ui.h"
+#include "ardour_http.h"
 #include "public_editor.h"
 #include "gui_thread.h"
 #include "utils_videotl.h"
@@ -37,7 +38,7 @@
 #include <pthread.h>
 #include <curl/curl.h>
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -85,7 +86,7 @@ VideoTimeLine::save_session ()
                return;
        }
 
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
 
        XMLNode* node = new XMLNode(X_("Videomonitor"));
        if (!node) return;
@@ -142,8 +143,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_("C"));
+       _session->SessionSaveUnderway.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
+       LocaleGuard lg;
 
        XMLNode* node = _session->extra_xml (X_("Videotimeline"));
 
@@ -155,38 +156,38 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
 
        set_id(*node);
 
-       const XMLProperty* proph = node->property (X_("Height"));
+       XMLProperty const * proph = node->property (X_("Height"));
        if (proph) {
                editor->set_video_timeline_height(atoi(proph->value()));
        }
 #if 0 /* TODO THINK: set FPS first time only ?! */
-       const XMLProperty* propasfps = node->property (X_("AutoFPS"));
+       XMLProperty const * propasfps = node->property (X_("AutoFPS"));
        if (propasfps) {
                auto_set_session_fps = atoi(propasfps->value())?true:false;
        }
 #endif
 
-       const XMLProperty* propoffset = node->property (X_("VideoOffset"));
+       XMLProperty const * propoffset = node->property (X_("VideoOffset"));
        if (propoffset) {
                video_offset = atoll(propoffset->value());
                video_offset_p = video_offset;
        }
 
-       const XMLProperty* proplock = node->property (X_("VideoOffsetLock"));
+       XMLProperty const * proplock = node->property (X_("VideoOffsetLock"));
        if (proplock) {
                video_offset_lock = atoi(proplock->value())?true:false;
        }
 
-       const XMLProperty* localfile = node->property (X_("LocalFile"));
+       XMLProperty const * localfile = node->property (X_("LocalFile"));
        if (localfile) {
                local_file = atoi(localfile->value())?true:false;
        }
 
-       const XMLProperty* propf = node->property (X_("Filename"));
+       XMLProperty const * propf = node->property (X_("Filename"));
        video_file_info(propf->value(), local_file);
 
        if ((node = _session->extra_xml (X_("Videomonitor")))) {
-               const XMLProperty* prop = node->property (X_("active"));
+               XMLProperty const * prop = node->property (X_("active"));
                if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
                        open_video_monitor();
                }
@@ -224,8 +225,8 @@ VideoTimeLine::save_undo ()
 int
 VideoTimeLine::set_state (const XMLNode& node, int /*version*/)
 {
-       LocaleGuard lg (X_("C"));
-       const XMLProperty* propoffset = node.property (X_("VideoOffset"));
+       LocaleGuard lg;
+       XMLProperty const * propoffset = node.property (X_("VideoOffset"));
        if (propoffset) {
                video_offset = atoll(propoffset->value());
        }
@@ -237,7 +238,7 @@ XMLNode&
 VideoTimeLine::get_state ()
 {
        XMLNode* node = new XMLNode (X_("Videotimeline"));
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg;
        node->add_property (X_("VideoOffset"), video_offset_p);
        return *node;
 }
@@ -356,16 +357,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;
        }
@@ -552,7 +557,7 @@ VideoTimeLine::check_server ()
                        , video_server_url.c_str()
                        , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
                        );
-       char *res=a3_curl_http_get(url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL);
        if (res) {
                if (strstr(res, "status: ok, online.")) { ok = true; }
                free(res);
@@ -574,7 +579,7 @@ VideoTimeLine::check_server_docroot ()
                        , video_server_url.c_str()
                        , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
                        );
-       char *res=a3_curl_http_get(url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL);
        if (!res) {
                return false;
        }
@@ -670,7 +675,7 @@ VideoTimeLine::flush_cache () {
                        , video_server_url.c_str()
                        , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
                        );
-       char *res=a3_curl_http_get(url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL);
        if (res) {
                free (res);
        }
@@ -742,7 +747,12 @@ VideoTimeLine::find_xjadeo () {
                        return;
                }
 
-               version_check.wait ();
+#ifdef PLATFORM_WINDOWS
+               version_check.wait (); // 40ms timeout
+#else
+               version_check.wait (WNOHANG);
+#endif
+
                int timeout = 300;
                while (xjadeo_version.empty() && --timeout) {
                        Glib::usleep(10000);
@@ -795,7 +805,7 @@ VideoTimeLine::open_video_monitor() {
                /* load mask from Session */
                XMLNode* node = _session->extra_xml (X_("XJRestoreSettings"));
                if (node) {
-                       const XMLProperty* prop = node->property (X_("mask"));
+                       XMLProperty const * prop = node->property (X_("mask"));
                        if (prop) {
                                xj_settings_mask = atoi(prop->value());
                        }
@@ -816,7 +826,7 @@ VideoTimeLine::open_video_monitor() {
                if (_session) {
                        XMLNode* node = _session->extra_xml (X_("Videomonitor"));
                        if (node) {
-                               const XMLProperty* prop = node->property (X_("active"));
+                               XMLProperty const * prop = node->property (X_("active"));
                                if (prop && prop->value() != "yes") _session->set_dirty ();
                        } else {
                                _session->set_dirty ();