X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_timeline.cc;h=b68f57076e1662c3b55cdd569648f27845daa7b7;hb=c358e77e1e81a68fcb8b18cd71a31c38262b2af7;hp=269e4656233a64b74c90890ce6cd8bf8a932b2f3;hpb=f7abf2de82d2bf97eaa7395b7056771197f1fe36;p=ardour.git

diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 269e465623..b68f57076e 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -17,8 +17,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-#ifdef WITH_VIDEOTIMELINE
-
 #include <algorithm>
 #include <sigc++/bind.h>
 #include "ardour/tempo.h"
@@ -30,8 +28,6 @@
 #include "public_editor.h"
 #include "gui_thread.h"
 #include "utils.h"
-#include "canvas_impl.h"
-#include "simpleline.h"
 #include "utils_videotl.h"
 #include "rgb_macros.h"
 #include "video_timeline.h"
@@ -49,7 +45,7 @@ using namespace Timecode;
 
 VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height)
 	: editor (ed)
-		, videotl_bar_group(vbg)
+		, videotl_group(vbg)
 		, bar_height(initial_height)
 {
 	video_start_offset = 0L;
@@ -89,63 +85,26 @@ VideoTimeLine::save_session ()
 
 	LocaleGuard lg (X_("POSIX"));
 
-	bool is_dirty = false;
-
-	XMLNode* prev = _session->extra_xml (X_("Videomonitor"));
-
-	/* remember if vmonitor was open.. */
 	XMLNode* node = new XMLNode(X_("Videomonitor"));
-
+	if (!node) return;
 	node->add_property (X_("active"), (vmonitor && vmonitor->is_started())?"yes":"no");
-	if (!prev || !(prev->property (X_("active")) && prev->property (X_("active"))->value() == node->property(X_("active"))->value()) ){
-		_session->add_extra_xml (*node);
-		is_dirty=true; // TODO not if !prev && value==default
-	}
-
-	/* VTL settings */
-	node = _session->extra_xml (X_("Videotimeline"));
-
-	if (node) {
-		if (!(node->property(X_("id")) && node->property(X_("id"))->value() == id().to_s())) {
-			node->add_property (X_("id"), id().to_s());
-			is_dirty=true;
-		}
-	}
-
-	/* remember timeline height.. */
-	if (node) {
-		int h = editor->get_videotl_bar_height();
-		if (!(node->property(X_("Height")) && atoi(node->property(X_("Height"))->value().c_str())==h)) {
-			node->add_property (X_("Height"), h);
-			is_dirty=true;
-		}
-	}
+	_session->add_extra_xml (*node);
 
-	/* save video-offset-lock */
-	if (node) {
-		if (!(node->property(X_("VideoOffsetLock")) && atoi(node->property(X_("VideoOffsetLock"))->value().c_str())==video_offset_lock)) {
-			node->add_property (X_("VideoOffsetLock"), video_offset_lock?X_("1"):X_("0"));
-			is_dirty=true;
-		}
-	}
-	/* save video-offset */
-	if (node) {
-		if (!(node->property(X_("VideoOffset")) && atoll(node->property(X_("VideoOffset"))->value().c_str())==video_offset)) {
-			node->add_property (X_("VideoOffset"), video_offset);
-			is_dirty=true;
+	if (vmonitor) {
+		if (vmonitor->is_started()) {
+			vmonitor->query_full_state(true);
 		}
+		vmonitor->save_session();
 	}
 
-	/* save 'auto_set_session_fps' */
-	if (node) {
-		if (!(node->property(X_("AutoFPS")) && atoi(node->property(X_("AutoFPS"))->value().c_str())==auto_set_session_fps)) {
-			node->add_property (X_("AutoFPS"), auto_set_session_fps?X_("1"):X_("0"));
-			is_dirty=true;
-		}
-	}
-	if (is_dirty) {
-		_session->set_dirty ();
-	}
+	/* VTL settings */
+	node = _session->extra_xml (X_("Videotimeline"));
+	if (!node) return;
+	node->add_property (X_("id"), id().to_s());
+	node->add_property (X_("Height"), editor->get_videotl_bar_height());
+	node->add_property (X_("VideoOffsetLock"), video_offset_lock?X_("1"):X_("0"));
+	node->add_property (X_("VideoOffset"), video_offset);
+	node->add_property (X_("AutoFPS"), auto_set_session_fps?X_("1"):X_("0"));
 }
 
 /* close and save settings */
@@ -155,7 +114,7 @@ VideoTimeLine::close_session ()
 	if (video_duration == 0) {
 		return;
 	}
-	save_session();
+	sessionsave.disconnect();
 	close_video_monitor();
 
 	remove_frames();
@@ -164,6 +123,15 @@ VideoTimeLine::close_session ()
 	GuiUpdate("set-xjadeo-sensitive-off");
 }
 
+void
+VideoTimeLine::sync_session_state ()
+{
+	if (!_session || !vmonitor || !vmonitor->is_started()) {
+		return;
+	}
+	save_session();
+}
+
 /** load settings from session */
 void
 VideoTimeLine::set_session (ARDOUR::Session *s)
@@ -171,7 +139,7 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
 	SessionHandlePtr::set_session (s);
 	if (!_session) { return ; }
 
-	_session->SaveSession.connect_same_thread (*this, boost::bind (&VideoTimeLine::save_session, this));
+	_session->SaveSession.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
 	LocaleGuard lg (X_("POSIX"));
 
 	XMLNode* node = _session->extra_xml (X_("Videotimeline"));
@@ -301,7 +269,7 @@ float
 VideoTimeLine::get_apv()
 {
 	// XXX: dup code - TODO use this fn in update_video_timeline()
-	float apv = -1; /* audio frames per video frame; */
+	float apv = -1; /* audio samples per video frame; */
 	if (!_session) return apv;
 
 	if (_session->config.get_use_video_file_fps()) {
@@ -334,8 +302,8 @@ VideoTimeLine::update_video_timeline()
 		if (_session->timecode_frames_per_second() == 0 ) return;
 	}
 
-	double frames_per_unit = editor->unit_to_frame(1.0);
-	framepos_t leftmost_frame =  editor->leftmost_position();
+	const double samples_per_pixel = editor->get_current_zoom();
+	const framepos_t leftmost_sample =  editor->leftmost_sample();
 
 	/* Outline:
 	 * 1) calculate how many frames there should be in current zoom (plus 1 page on each side)
@@ -347,12 +315,12 @@ 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 frames per video frame; */
+	float apv; /* audio samples per video frame; */
 	framepos_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-frames ; first displayed video-frame */
-	framepos_t vtl_dist;  /* unit: audio-frames ; distance between displayed video-frames */
+	framepos_t vtl_start; /* unit: audio-samples ; first displayed video-frame */
+	framepos_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()) {
@@ -368,12 +336,12 @@ VideoTimeLine::update_video_timeline()
 
 	display_vframe_width = bar_height * video_aspect_ratio;
 
-	if (apv > frames_per_unit * display_vframe_width) {
+	if (apv > samples_per_pixel * display_vframe_width) {
 		/* high-zoom: need space between successive video-frames */
 		vtl_dist = rint(apv);
 	} else {
 		/* continous timeline: skip video-frames */
-		vtl_dist = ceil(display_vframe_width * frames_per_unit / apv) * apv;
+		vtl_dist = ceil(display_vframe_width * samples_per_pixel / apv) * apv;
 	}
 
 	assert (vtl_dist > 0);
@@ -381,10 +349,10 @@ VideoTimeLine::update_video_timeline()
 
 #define GOFFSET (video_offset)
 
-	leftmost_video_frame = floor (floor((leftmost_frame - video_start_offset - GOFFSET ) / vtl_dist) * vtl_dist / apv);
+	leftmost_video_frame = floor (floor((leftmost_sample - video_start_offset - GOFFSET ) / vtl_dist) * vtl_dist / apv);
 
 	vtl_start = rint (GOFFSET + video_start_offset + leftmost_video_frame * apv);
-	visible_video_frames = 2 + ceil(editor->current_page_frames() / vtl_dist); /* +2 left+right partial frames */
+	visible_video_frames = 2 + ceil(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;
@@ -411,7 +379,7 @@ VideoTimeLine::update_video_timeline()
 
 	while (video_frames.size() < visible_video_frames) {
 		VideoImageFrame *frame;
-		frame = new VideoImageFrame(*editor, *videotl_bar_group, display_vframe_width, bar_height, video_server_url, translated_filename());
+		frame = new VideoImageFrame(*editor, *videotl_group, display_vframe_width, bar_height, video_server_url, translated_filename());
 		frame->ImgChanged.connect (*this, invalidator (*this), boost::bind (&PublicEditor::queue_visual_videotimeline_update, editor), gui_context());
 		video_frames.push_back(frame);
 	}
@@ -433,7 +401,7 @@ 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 vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-samples */
 		framepos_t vframeno = rint ( (vfpos - GOFFSET) / apv); /* unit: video-frames */
 		vfpos = (vframeno * apv ) + GOFFSET; /* audio-frame  corresponding to /rounded/ video-frame */
 
@@ -444,7 +412,7 @@ VideoTimeLine::update_video_timeline()
 		}
 		VideoImageFrame * frame = get_video_frame(vframeno, cut, rightend);
 		if (frame) {
-		  frame->set_position(vfpos-leftmost_frame);
+		  frame->set_position(vfpos);
 			outdated_video_frames.remove(frame);
 		} else {
 			remaining.push_back(vfcount);
@@ -454,18 +422,17 @@ VideoTimeLine::update_video_timeline()
 	for (VideoFrames::iterator i = outdated_video_frames.begin(); i != outdated_video_frames.end(); ++i ) {
 		VideoImageFrame *frame = (*i);
 		if (remaining.empty()) {
-		  frame->set_position(-2 * vtl_dist); /* move off screen */
+		  frame->set_position(-2 * vtl_dist + leftmost_sample); /* move off screen */
 		} else {
 			int vfcount=remaining.front();
 			remaining.pop_front();
-			framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-frames */
+			framepos_t vfpos = vtl_start + vfcount * vtl_dist; /* unit: audio-samples */
 			framepos_t vframeno = rint ((vfpos - GOFFSET) / apv);  /* unit: video-frames */
 			int rightend = -1; /* unit: pixels */
 			if (vfpos + vtl_dist > video_start_offset + video_duration + GOFFSET) {
 				rightend = display_vframe_width * (video_start_offset + video_duration + GOFFSET - vfpos) / vtl_dist;
-				//printf("lf(n): %lu\n", vframeno); // XXX
 			}
-			frame->set_position(vfpos-leftmost_frame);
+			frame->set_position(vfpos);
 			frame->set_videoframe(vframeno, rightend);
 		}
 	}
@@ -532,7 +499,7 @@ VideoTimeLine::video_file_info (std::string filename, bool local)
 				_session->config.set_timecode_format(timecode_60);
 				break;
 			default:
-				warning << _("Failed to set session-framerate: ") << video_file_fps << _(" does not have a corresponding option setting in Ardour.") << endmsg; /* TODO: gettext arg */
+				warning << _("Failed to set session-fps: ") << video_file_fps << _(" does not have a corresponding option setting in Ardour.") << endmsg; /* TODO: gettext arg */
 				break;
 		}
 		_session->config.set_video_pullup(0); /* TODO only set if set_timecode_format() was successful ?!*/
@@ -761,6 +728,17 @@ VideoTimeLine::open_video_monitor() {
 		GuiUpdate("set-xjadeo-active-on");
 		vmonitor->set_fps(video_file_fps);
 		vmonitor->open(video_filename);
+
+		if (_session) {
+			XMLNode* node = _session->extra_xml (X_("Videomonitor"));
+			if (node) {
+				const XMLProperty* prop = node->property (X_("active"));
+				if (prop && prop->value() != "yes") _session->set_dirty ();
+			} else {
+				_session->set_dirty ();
+			}
+		}
+
 	}
 }
 
@@ -787,9 +765,13 @@ VideoTimeLine::terminated_video_monitor () {
 	}
 	GuiUpdate("set-xjadeo-active-off");
 	vmonitor=0;
-  if (reopen_vmonitor) {
+	if (reopen_vmonitor) {
 		reopen_vmonitor=false;
 		open_video_monitor();
+	} else {
+		if (_session) {
+			_session->set_dirty ();
+		}
 	}
 }
 
@@ -816,5 +798,3 @@ VideoTimeLine::manual_seek_video_monitor (framepos_t pos)
 	if (!vmonitor->synced_by_manual_seeks()) { return; }
 	vmonitor->manual_seek(pos, false, GOFFSET); // XXX -> set offset in xjadeo
 }
-
-#endif /* WITH_VIDEOTIMELINE */