return;
}
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg (X_("C"));
XMLNode* node = new XMLNode(X_("Videomonitor"));
if (!node) return;
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"));
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());
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;
}
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;
}
{
if (v_major >= 1) v_ok = true;
else if (v_major == 0 && v_minor >= 8) v_ok = true;
- else if (v_major == 0 && v_minor >= 7 && v_micro >= 7) v_ok = true;
}
}
if (!v_ok) {
_xjadeo_bin = X_("");
warning << _(
"Video-monitor 'xjadeo' is too old. "
- "Please install xjadeo version 0.7.7 or later. http://xjadeo.sf.net/"
+ "Please install xjadeo version 0.8.0 or later. http://xjadeo.sf.net/"
) << endmsg;
}
}