projects / ardour.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
more changes flowing from a persistent MonitorSection object
[ardour.git] / gtk2_ardour / video_timeline.cc
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 6daa87b147151b890ab26e4ee2dca16e44792583..d8bec5e23b9285250052827ca1d3e28524623dad 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -23,6 +23,7 @@
 
 #include "pbd/file_utils.h"
 #include "pbd/types_convert.h"
+#include "ardour/filesystem_paths.h"
 #include "ardour/session_directory.h"
 
 #include "ardour_ui.h"
@@ -32,7 +33,6 @@
 #include "utils_videotl.h"
 #include "rgb_macros.h"
 #include "video_timeline.h"
-#include "video_tool_paths.h"
 
 #include <gtkmm2ext/utils.h>
 #include <pthread.h>
@@ -48,8 +48,8 @@ using namespace VideoUtils;
 
 VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Container *vbg, int initial_height)
        : editor (ed)
-               , videotl_group(vbg)
-               , bar_height(initial_height)
+       , videotl_group(vbg)
+       , bar_height(initial_height)
 {
        video_start_offset = 0L;
        video_offset = 0L;
@@ -62,7 +62,7 @@ VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Container *vbg, in
        video_filename = "";
        local_file = true;
        video_file_fps = 25.0;
-       flush_frames = false;
+       _flush_frames = false;
        vmonitor=0;
        reopen_vmonitor=false;
        find_xjadeo();
@@ -87,8 +87,6 @@ VideoTimeLine::save_session ()
                return;
        }
 
-       LocaleGuard lg;
-
        XMLNode* node = new XMLNode(X_("Videomonitor"));
        if (!node) return;
        node->set_property (X_("active"), (vmonitor && vmonitor->is_started()));
@@ -121,7 +119,7 @@ VideoTimeLine::close_session ()
        sessionsave.disconnect();
        close_video_monitor();
 
-       remove_frames();
+       remove_frames ();
        video_filename = "";
        video_duration = 0;
        GuiUpdate("set-xjadeo-sensitive-off");
@@ -145,7 +143,6 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
        if (!_session) { return ; }
 
        _session->SessionSaveUnderway.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
-       LocaleGuard lg;
 
        XMLNode* node = _session->extra_xml (X_("Videotimeline"));
 
@@ -220,7 +217,6 @@ VideoTimeLine::save_undo ()
 int
 VideoTimeLine::set_state (const XMLNode& node, int /*version*/)
 {
-       LocaleGuard lg;
        node.get_property (X_("VideoOffset"), video_offset);
        ARDOUR_UI::instance()->flush_videotimeline_cache(true);
        return 0;
@@ -230,7 +226,6 @@ XMLNode&
 VideoTimeLine::get_state ()
 {
        XMLNode* node = new XMLNode (X_("Videotimeline"));
-       LocaleGuard lg;
        node->set_property (X_("VideoOffset"), video_offset_p);
        return *node;
 }
@@ -239,19 +234,19 @@ void
 VideoTimeLine::remove_frames ()
 {
        for (VideoFrames::iterator i = video_frames.begin(); i != video_frames.end(); ++i ) {
-               VideoImageFrame *frame = (*i);
+               VideoImageFrame* frame = (*i);
                delete frame;
                (*i) = 0;
        }
        video_frames.clear();
 }
 
-VideoImageFrame *
-VideoTimeLine::get_video_frame (framepos_t vfn, int cut, int rightend)
+VideoImageFrame*
+VideoTimeLine::get_video_frame (samplepos_t vfn, int cut, int rightend)
 {
        if (vfn==0) cut=0;
        for (VideoFrames::iterator i = video_frames.begin(); i != video_frames.end(); ++i) {
-               VideoImageFrame *frame = (*i);
+               VideoImageFrame* frame = (*i);
                if (abs(frame->get_video_frame_number()-vfn)<=cut
                    && frame->get_rightend() == rightend) { return frame; }
        }
@@ -272,9 +267,9 @@ VideoTimeLine::get_apv()
        }
 
        if (_session->config.get_videotimeline_pullup()) {
-               apv = _session->frame_rate();
+               apv = _session->sample_rate();
        } else {
-               apv = _session->nominal_frame_rate();
+               apv = _session->nominal_sample_rate();
        }
        if (_session->config.get_use_video_file_fps()) {
                apv /= video_file_fps;
@@ -296,7 +291,7 @@ VideoTimeLine::update_video_timeline()
        }
 
        const double samples_per_pixel = editor->get_current_zoom();
-       const framepos_t leftmost_sample =  editor->leftmost_sample();
+       const samplepos_t leftmost_sample =  editor->leftmost_sample();
 
        /* Outline:
         * 1) calculate how many frames there should be in current zoom (plus 1 page on each side)
@@ -309,17 +304,17 @@ VideoTimeLine::update_video_timeline()
        /* video-file and session properties */
        double display_vframe_width; /* unit: pixels ; width of one thumbnail in the timeline */
        float apv; /* audio samples per video frame; */
-       framepos_t leftmost_video_frame; /* unit: video-frame number ; temporary var -> vtl_start */
+       samplepos_t leftmost_video_frame; /* unit: video-frame number ; temporary var -> vtl_start */
 
        /* variables needed to render videotimeline -- what needs to computed first */
-       framepos_t vtl_start; /* unit: audio-samples ; first displayed video-frame */
-       framepos_t vtl_dist;  /* unit: audio-samples ; distance between displayed video-frames */
+       samplepos_t vtl_start; /* unit: audio-samples ; first displayed video-frame */
+       samplepos_t vtl_dist;  /* unit: audio-samples ; distance between displayed video-frames */
        unsigned int visible_video_frames; /* number of frames that fit on current canvas */
 
        if (_session->config.get_videotimeline_pullup()) {
-               apv = _session->frame_rate();
+               apv = _session->sample_rate();
        } else {
-               apv = _session->nominal_frame_rate();
+               apv = _session->nominal_sample_rate();
        }
        if (_session->config.get_use_video_file_fps()) {
                apv /= video_file_fps;
@@ -367,9 +362,9 @@ VideoTimeLine::update_video_timeline()
                --visible_video_frames;
        }
 
-       if (flush_frames) {
-               remove_frames();
-               flush_frames=false;
+       if (_flush_frames) {
+               remove_frames ();
+               _flush_frames = false;
        }
 
        while (video_frames.size() < visible_video_frames) {
@@ -385,9 +380,9 @@ VideoTimeLine::update_video_timeline()
        outdated_video_frames = video_frames;
 
 #if 1
-       /* when zoomed out, ignore shifts by +-1 frame
+       /* when zoomed out, ignore shifts by +-1 sample
         * which can occur due to rounding errors when
-        * scrolling to a new leftmost-audio frame.
+        * scrolling to a new leftmost-audio sample.
         */
        int cut =1;
        if (vtl_dist/apv < 3.0) cut =0;
@@ -396,33 +391,33 @@ VideoTimeLine::update_video_timeline()
 #endif
 
        for (unsigned int vfcount=0; vfcount < visible_video_frames; ++vfcount){
-               framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-frames */
-               framepos_t vframeno = rint ( (vfpos - video_offset) / apv); /* unit: video-frames */
-               vfpos = (vframeno * apv ) + video_offset; /* audio-frame  corresponding to /rounded/ video-frame */
+               samplepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-samples */
+               samplepos_t vframeno = rint ( (vfpos - video_offset) / apv); /* unit: video-frames */
+               vfpos = (vframeno * apv ) + video_offset; /* audio-sample  corresponding to /rounded/ video-frame */
 
                int rightend = -1; /* unit: pixels */
                if (vfpos + vtl_dist > video_start_offset + video_duration + video_offset) {
                        rightend = display_vframe_width * (video_start_offset + video_duration + video_offset - vfpos) / vtl_dist;
                        //printf("lf(e): %lu\n", vframeno); // XXX
                }
-               VideoImageFrame * frame = get_video_frame(vframeno, cut, rightend);
+               VideoImageFrame* frame = get_video_frame(vframeno, cut, rightend);
                if (frame) {
                  frame->set_position(vfpos);
-                       outdated_video_frames.remove(frame);
+                       outdated_video_frames.remove (frame);
                } else {
                        remaining.push_back(vfcount);
                }
        }
 
        for (VideoFrames::iterator i = outdated_video_frames.begin(); i != outdated_video_frames.end(); ++i ) {
-               VideoImageFrame *frame = (*i);
+               VideoImageFrame* frame = (*i);
                if (remaining.empty()) {
                  frame->set_position(-2 * vtl_dist + leftmost_sample); /* move off screen */
                } else {
-                       int vfcount=remaining.front();
+                       int vfcount = remaining.front();
                        remaining.pop_front();
-                       framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-frames */
-                       framepos_t vframeno = rint ((vfpos - video_offset) / apv);  /* unit: video-frames */
+                       samplepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-samples */
+                       samplepos_t vframeno = rint ((vfpos - video_offset) / apv);  /* unit: video-frames */
                        int rightend = -1; /* unit: pixels */
                        if (vfpos + vtl_dist > video_start_offset + video_duration + video_offset) {
                                rightend = display_vframe_width * (video_start_offset + video_duration + video_offset - vfpos) / vtl_dist;
@@ -468,8 +463,8 @@ VideoTimeLine::video_file_info (std::string filename, bool local)
                GuiUpdate("video-unavailable");
                return false;
        }
-       video_duration = _duration * _session->nominal_frame_rate() / video_file_fps;
-       video_start_offset = _start_offset * _session->nominal_frame_rate();
+       video_duration = _duration * _session->nominal_sample_rate() / video_file_fps;
+       video_start_offset = _start_offset * _session->nominal_sample_rate();
 
        if (auto_set_session_fps && video_file_fps != _session->timecode_frames_per_second()) {
                switch ((int)floorf(video_file_fps*1000.0)) {
@@ -549,7 +544,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 = ArdourCurl::http_get (url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL, false);
        if (res) {
                if (strstr(res, "status: ok, online.")) { ok = true; }
                free(res);
@@ -571,7 +566,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 = ArdourCurl::http_get (url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL, false);
        if (!res) {
                return false;
        }
@@ -655,7 +650,7 @@ VideoTimeLine::vmon_update () {
 
 void
 VideoTimeLine::flush_local_cache () {
-       flush_frames = true;
+       _flush_frames = true;
        vmon_update();
 }
 
@@ -667,7 +662,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 = ArdourCurl::http_get (url, NULL);
+       char* res = ArdourCurl::http_get (url, NULL, false);
        if (res) {
                free (res);
        }
@@ -920,7 +915,7 @@ VideoTimeLine::terminated_video_monitor () {
 }
 
 void
-VideoTimeLine::manual_seek_video_monitor (framepos_t pos)
+VideoTimeLine::manual_seek_video_monitor (samplepos_t pos)
 {
        if (!vmonitor) { return; }
        if (!vmonitor->is_started()) { return; }
Unnamed repository; edit this file 'description' to name the repository.