Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifdef WITH_VIDEOTIMELINE
-
+#include <algorithm>
#include <sigc++/bind.h>
#include "ardour/tempo.h"
#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"
using namespace PBD;
using namespace Timecode;
-#ifndef MAX
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
-#endif
-
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;
auto_set_session_fps = false;
video_offset_lock = false;
video_aspect_ratio = 4.0/3.0;
- open_video_monitor_dialog = 0;
Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&VideoTimeLine::parameter_changed, this, _1), gui_context());
- video_server_url = Config->get_video_server_url();
- server_docroot = Config->get_video_server_docroot();
+ video_server_url = video_get_server_url(Config);
+ server_docroot = video_get_docroot(Config);
video_filename = "";
local_file = true;
video_file_fps = 25.0;
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 */
void
VideoTimeLine::close_session ()
{
+ if (video_duration == 0) {
+ return;
+ }
+ sessionsave.disconnect();
close_video_monitor();
- save_session();
remove_frames();
video_filename = "";
- video_duration = 0L;
+ video_duration = 0;
+ GuiUpdate("set-xjadeo-sensitive-off");
+}
+
+void
+VideoTimeLine::sync_session_state ()
+{
+ if (!_session || !vmonitor || !vmonitor->is_started()) {
+ return;
+ }
+ save_session();
}
/** load settings from session */
SessionHandlePtr::set_session (s);
if (!_session) { return ; }
+ _session->SaveSession.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
LocaleGuard lg (X_("POSIX"));
XMLNode* node = _session->extra_xml (X_("Videotimeline"));
+
+ if (!node || !node->property (X_("Filename"))) {
+ return;
+ }
+
if (node) {
ARDOUR_UI::instance()->start_video_server((Gtk::Window*)0, false);
node = _session->extra_xml (X_("Videomonitor"));
if (node) {
const XMLProperty* prop = node->property (X_("active"));
- if (prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
- open_video_monitor(false);
+ if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
+ open_video_monitor();
}
}
_session->config.ParameterChanged.connect (*this, invalidator (*this), ui_bind (&VideoTimeLine::parameter_changed, this, _1), gui_context());
}
+void
+VideoTimeLine::set_offset_locked (bool v) {
+ if (_session && v != video_offset_lock) {
+ _session->set_dirty ();
+ }
+ video_offset_lock = v;
+}
+
+void
+VideoTimeLine::toggle_offset_locked () {
+ video_offset_lock = !video_offset_lock;
+ if (_session) {
+ _session->set_dirty ();
+ }
+}
+
void
VideoTimeLine::save_undo ()
{
+ if (_session && video_offset_p != video_offset) {
+ _session->set_dirty ();
+ }
video_offset_p = video_offset;
}
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()) {
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)
/* 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()) {
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);
#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;
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);
}
#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 */
}
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);
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);
}
}
_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 ?!*/
}
flush_local_cache ();
- _session->maybe_update_session_range(
- MAX(get_offset(), 0),
- MAX(get_offset() + get_duration(), 0)
- );
-
if (found_xjadeo() && local_file) {
GuiUpdate("set-xjadeo-sensitive-on");
if (vmonitor && vmonitor->is_started()) {
+#if 1
+ /* xjadeo <= 0.6.4 has a bug where changing the video-file may segfauls
+ * if the geometry changes to a different line-size alignment
+ */
+ reopen_vmonitor = true;
+ vmonitor->quit();
+#else
vmonitor->set_fps(video_file_fps);
vmonitor->open(video_filename);
+#endif
}
} else if (!local_file) {
#if 1 /* temp debug/devel message */
editor->toggle_xjadeo_proc(0);
//close_video_monitor();
editor->set_xjadeo_sensitive(false);
+ } else if (t == "xjadeo-window-ontop-on") {
+ editor->toggle_xjadeo_viewoption(1, 1);
+ } else if (t == "xjadeo-window-ontop-off") {
+ editor->toggle_xjadeo_viewoption(1, 0);
+ } else if (t == "xjadeo-window-osd-timecode-on") {
+ editor->toggle_xjadeo_viewoption(2, 1);
+ } else if (t == "xjadeo-window-osd-timecode-off") {
+ editor->toggle_xjadeo_viewoption(2, 0);
+ } else if (t == "xjadeo-window-osd-frame-on") {
+ editor->toggle_xjadeo_viewoption(3, 1);
+ } else if (t == "xjadeo-window-osd-frame-off") {
+ editor->toggle_xjadeo_viewoption(3, 0);
+ } else if (t == "xjadeo-window-osd-box-on") {
+ editor->toggle_xjadeo_viewoption(4, 1);
+ } else if (t == "xjadeo-window-osd-box-off") {
+ editor->toggle_xjadeo_viewoption(4, 0);
+ } else if (t == "xjadeo-window-fullscreen-on") {
+ editor->toggle_xjadeo_viewoption(5, 1);
+ } else if (t == "xjadeo-window-fullscreen-off") {
+ editor->toggle_xjadeo_viewoption(5, 0);
+ } else if (t == "xjadeo-window-letterbox-on") {
+ editor->toggle_xjadeo_viewoption(6, 1);
+ } else if (t == "xjadeo-window-letterbox-off") {
+ editor->toggle_xjadeo_viewoption(6, 0);
}
}
void
VideoTimeLine::set_height (int height) {
+ if (_session && bar_height != height) {
+ _session->set_dirty ();
+ }
bar_height = height;
flush_local_cache();
}
VideoTimeLine::parameter_changed (std::string const & p)
{
if (p == "video-server-url") {
- set_video_server_url (Config->get_video_server_url ());
+ set_video_server_url (video_get_server_url(Config));
} else if (p == "video-server-docroot") {
- set_video_server_docroot (Config->get_video_server_docroot ());
+ set_video_server_docroot (video_get_docroot(Config));
+ } else if (p == "video-advanced-setup") {
+ set_video_server_url (video_get_server_url(Config));
+ set_video_server_docroot (video_get_docroot(Config));
}
if (p == "use-video-file-fps" || p == "videotimeline-pullup" ) { /* session->config parameter */
VtlUpdate();
}
void
-VideoTimeLine::open_video_monitor(bool interactive) {
+VideoTimeLine::open_video_monitor() {
if (!found_xjadeo()) return;
if (!vmonitor) {
vmonitor = new VideoMonitor(editor, _xjadeo_bin);
vmonitor->set_session(_session);
vmonitor->Terminated.connect (sigc::mem_fun (*this, &VideoTimeLine::terminated_video_monitor));
+ vmonitor->UiState.connect (*this, invalidator (*this), boost::bind (&VideoTimeLine::gui_update, this, _1), gui_context());
} else if (vmonitor->is_started()) {
return;
}
}
}
- if (interactive && Config->get_video_monitor_setup_dialog()) {
- if (open_video_monitor_dialog == 0) {
- open_video_monitor_dialog = new OpenVideoMonitorDialog(_session);
- }
- if (open_video_monitor_dialog->is_visible()) {
- return;
- }
- open_video_monitor_dialog->setup_settings_mask(xj_settings_mask);
- open_video_monitor_dialog->set_filename(video_filename);
- Gtk::ResponseType r = (Gtk::ResponseType) open_video_monitor_dialog->run ();
- open_video_monitor_dialog->hide();
- if (r != Gtk::RESPONSE_ACCEPT) {
- GuiUpdate("set-xjadeo-active-off");
- return;
- }
-
- if (_session && (xj_settings_mask != open_video_monitor_dialog->xj_settings_mask()) ) {
- /* save mask to Session */
- XMLNode* node = new XMLNode(X_("XJRestoreSettings"));
- node->add_property (X_("mask"), (const long) open_video_monitor_dialog->xj_settings_mask() );
- _session->add_extra_xml (*node);
- _session->set_dirty ();
- }
-
- if (open_video_monitor_dialog->show_again()) {
- Config->set_video_monitor_setup_dialog(false);
- }
-#if 1
- vmonitor->set_debug(open_video_monitor_dialog->enable_debug());
-#endif
- vmonitor->restore_settings_mask(open_video_monitor_dialog->xj_settings_mask());
- } else {
- vmonitor->restore_settings_mask(xj_settings_mask);
- }
-
+ vmonitor->restore_settings_mask(xj_settings_mask);
if (!vmonitor->start()) {
warning << "launching xjadeo failed.." << endmsg;
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 ();
+ }
+ }
+
}
}
}
}
+void
+VideoTimeLine::control_video_monitor(int what, int param) {
+ if (!vmonitor || !vmonitor->is_started()) {
+ return;
+ }
+ vmonitor->send_cmd(what, param);
+}
+
+
void
VideoTimeLine::terminated_video_monitor () {
if (vmonitor) {
}
GuiUpdate("set-xjadeo-active-off");
vmonitor=0;
- if (reopen_vmonitor) {
+ if (reopen_vmonitor) {
reopen_vmonitor=false;
- open_video_monitor(false);
+ open_video_monitor();
+ } else {
+ if (_session) {
+ _session->set_dirty ();
+ }
}
}
if (!vmonitor->synced_by_manual_seeks()) { return; }
vmonitor->manual_seek(pos, false, GOFFSET); // XXX -> set offset in xjadeo
}
-
-#endif /* WITH_VIDEOTIMELINE */
projects / ardour.git / blobdiff