tweak A/V import logic

[ardour.git] / gtk2_ardour / video_timeline.cc

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 265c60c708a0487e3d3347c6266c1d565a35429b..8adc7bc4d093b7b4bb8463e3a56d2dd64142c0a4 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -43,6 +43,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Timecode;
+using namespace VideoUtils;
 
 VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height)
        : editor (ed)
@@ -346,17 +347,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;
        }
 
@@ -500,14 +501,18 @@ VideoTimeLine::video_file_info (std::string filename, bool local)
                                _session->config.set_timecode_format(timecode_60);
                                break;
                        default:
-                               warning << _("Failed to set session-fps: ") << video_file_fps << _(" does not have a corresponding option setting in Ardour.") << endmsg; /* TODO: gettext arg */
+                               warning << string_compose (
+                                               _("Failed to set session-framerate: '%1' does not have a corresponding option setting in %2."),
+                                               video_file_fps, PROGRAM_NAME ) << endmsg;
                                break;
                }
                _session->config.set_video_pullup(0); /* TODO only set if set_timecode_format() was successful ?!*/
        }
        if (floor(video_file_fps*100) != floor(_session->timecode_frames_per_second()*100)) {
-               warning << _("Video file's framerate is not equal to Ardour session timecode's framerate: ")
-                       << video_file_fps << _(" vs ") << _session->timecode_frames_per_second() << endmsg;
+               warning << string_compose(
+                               _("Video file's framerate is not equal to %1 session timecode's framerate: '%2' vs '%3'"),
+                                       PROGRAM_NAME, video_file_fps, _session->timecode_frames_per_second())
+                               << endmsg;
        }
        flush_local_cache ();
 
@@ -546,7 +551,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=curl_http_get(url, NULL);
+       char *res=a3_curl_http_get(url, NULL);
        if (res) {
                if (strstr(res, "status: ok, online.")) { ok = true; }
                free(res);
@@ -568,7 +573,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=curl_http_get(url, NULL);
+       char *res=a3_curl_http_get(url, NULL);
        if (!res) {
                return false;
        }
@@ -578,8 +583,8 @@ VideoTimeLine::check_server_docroot ()
                        || lines.at(0).empty()
                        || lines.at(0).at(0) != video_get_docroot(Config)) {
                warning << string_compose(
-                               _("Video-server docroot mismatch. Ardour: '%1', video-server: '%2'. This usually means that the video server was not started by ardour and uses a different document-root."),
-                               video_get_docroot(Config), lines.at(0).at(0))
+                               _("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
        }
@@ -664,7 +669,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=curl_http_get(url, NULL);
+       char *res=a3_curl_http_get(url, NULL);
        if (res) {
                free (res);
        }
@@ -712,7 +717,7 @@ VideoTimeLine::find_xjadeo () {
        std::string xjadeo_file_path;
        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)) {
+       } else if (find_file_in_search_path (Searchpath(Glib::getenv("PATH")), X_("xjremote"), xjadeo_file_path)) {
                _xjadeo_bin = xjadeo_file_path;
        }
        else if (Glib::file_test(X_("/Applications/Jadeo.app/Contents/MacOS/xjremote"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
@@ -812,8 +817,8 @@ VideoTimeLine::terminated_video_monitor () {
                vmonitor->save_session();
                delete vmonitor;
        }
-       GuiUpdate("set-xjadeo-active-off");
        vmonitor=0;
+       GuiUpdate("set-xjadeo-active-off");
        if (reopen_vmonitor) {
                reopen_vmonitor=false;
                open_video_monitor();