Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#ifdef WITH_VIDEOTIMELINE
-
#include <algorithm>
#include <sigc++/bind.h>
#include "ardour/tempo.h"
#include "pbd/file_utils.h"
+#include "pbd/convert.h"
#include "ardour/session_directory.h"
#include "ardour_ui.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 ARDOUR;
using namespace PBD;
using namespace Timecode;
+using namespace VideoUtils;
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 = video_get_server_url(Config);
server_docroot = video_get_docroot(Config);
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"));
+ _session->add_extra_xml (*node);
- 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;
- }
- }
-
- /* 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 */
if (video_duration == 0) {
return;
}
+ sessionsave.disconnect();
close_video_monitor();
- save_session();
remove_frames();
video_filename = "";
video_duration = 0;
GuiUpdate("set-xjadeo-sensitive-off");
+ GuiUpdate("video-unavailable");
+}
+
+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"));
return;
}
- if (node) {
- ARDOUR_UI::instance()->start_video_server((Gtk::Window*)0, false);
+ ARDOUR_UI::instance()->start_video_server((Gtk::Window*)0, false);
- set_id(*node);
+ set_id(*node);
- const XMLProperty* proph = node->property (X_("Height"));
- if (proph) {
- editor->set_video_timeline_height(atoi(proph->value().c_str()));
- }
+ const XMLProperty* proph = node->property (X_("Height"));
+ if (proph) {
+ editor->set_video_timeline_height(atoi(proph->value()));
+ }
#if 0 /* TODO THINK: set FPS first time only ?! */
- const XMLProperty* propasfps = node->property (X_("AutoFPS"));
- if (propasfps) {
- auto_set_session_fps = atoi(propasfps->value().c_str())?true:false;
- }
+ const XMLProperty* propasfps = node->property (X_("AutoFPS"));
+ if (propasfps) {
+ auto_set_session_fps = atoi(propasfps->value())?true:false;
+ }
#endif
- const XMLProperty* propoffset = node->property (X_("VideoOffset"));
- if (propoffset) {
- video_offset = atoll(propoffset->value().c_str());
- video_offset_p = video_offset;
- }
-
- const XMLProperty* proplock = node->property (X_("VideoOffsetLock"));
- if (proplock) {
- video_offset_lock = atoi(proplock->value().c_str())?true:false;
- }
+ const XMLProperty* propoffset = node->property (X_("VideoOffset"));
+ if (propoffset) {
+ video_offset = atoll(propoffset->value());
+ video_offset_p = video_offset;
+ }
- const XMLProperty* localfile = node->property (X_("LocalFile"));
- if (localfile) {
- local_file = atoi(localfile->value().c_str())?true:false;
- }
+ const XMLProperty* proplock = node->property (X_("VideoOffsetLock"));
+ if (proplock) {
+ video_offset_lock = atoi(proplock->value())?true:false;
+ }
- const XMLProperty* propf = node->property (X_("Filename"));
- video_file_info(propf->value(), local_file);
+ const XMLProperty* localfile = node->property (X_("LocalFile"));
+ if (localfile) {
+ local_file = atoi(localfile->value())?true:false;
}
- node = _session->extra_xml (X_("Videomonitor"));
- if (node) {
+ const XMLProperty* propf = node->property (X_("Filename"));
+ video_file_info(propf->value(), local_file);
+
+ if ((node = _session->extra_xml (X_("Videomonitor")))) {
const XMLProperty* prop = node->property (X_("active"));
if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
- open_video_monitor(false);
+ 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;
}
LocaleGuard lg (X_("POSIX"));
const XMLProperty* propoffset = node.property (X_("VideoOffset"));
if (propoffset) {
- video_offset = atoll(propoffset->value().c_str());
+ video_offset = atoll(propoffset->value());
}
ARDOUR_UI::instance()->flush_videotimeline_cache(true);
return 0;
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);
assert (apv > 0);
-#define GOFFSET (video_offset)
+ leftmost_video_frame = floor (floor((leftmost_sample - video_start_offset - video_offset ) / vtl_dist) * vtl_dist / apv);
- leftmost_video_frame = floor (floor((leftmost_frame - 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 */
+ 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 */
/* expand timeline (cache next/prev page images) */
vtl_start -= visible_video_frames * vtl_dist;
visible_video_frames *=3;
- if (vtl_start < GOFFSET ) {
+ if (vtl_start < video_offset ) {
visible_video_frames += ceil(vtl_start/vtl_dist);
- vtl_start = GOFFSET;
+ vtl_start = video_offset;
}
/* apply video-file constraints */
- if (vtl_start > video_start_offset + video_duration + GOFFSET ) {
+ if (vtl_start > video_start_offset + video_duration + video_offset ) {
visible_video_frames = 0;
}
/* TODO optimize: compute rather than iterate */
- while (visible_video_frames > 0 && vtl_start + (visible_video_frames-1) * vtl_dist >= video_start_offset + video_duration + GOFFSET) {
+ while (visible_video_frames > 0 && vtl_start + (visible_video_frames-1) * vtl_dist >= video_start_offset + video_duration + video_offset) {
--visible_video_frames;
}
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);
}
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 - GOFFSET) / apv); /* unit: video-frames */
- vfpos = (vframeno * apv ) + GOFFSET; /* audio-frame corresponding to /rounded/ video-frame */
+ framepos_t vframeno = rint ( (vfpos - video_offset) / apv); /* unit: video-frames */
+ vfpos = (vframeno * apv ) + video_offset; /* audio-frame corresponding to /rounded/ video-frame */
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;
+ 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);
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 vframeno = rint ((vfpos - GOFFSET) / apv); /* unit: video-frames */
+ framepos_t vframeno = rint ((vfpos - video_offset) / 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;
+ 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(n): %lu\n", vframeno); // XXX
}
- frame->set_position(vfpos-leftmost_frame);
+ frame->set_position(vfpos);
frame->set_videoframe(vframeno, rightend);
}
}
video_server_url, translated_filename(),
video_file_fps, _duration, _start_offset, video_aspect_ratio)) {
warning << _("Parsing video file info failed. Is the Video Server running? Is the file readable by the Video Server? Does the docroot match? Is it a video file?") << endmsg;
+ video_duration = 0;
+ GuiUpdate("set-xjadeo-sensitive-off");
+ GuiUpdate("video-unavailable");
return false;
}
video_duration = _duration * _session->nominal_frame_rate() / video_file_fps;
_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 << 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 (video_file_fps != _session->timecode_frames_per_second()) {
- warning << _("Video file's framerate is not equal to Ardour session timecode's framerate: ")
- << video_file_fps << _(" vs ") << _session->timecode_frames_per_second() << endmsg;
+ if (floor(video_file_fps*100) != floor(_session->timecode_frames_per_second()*100)) {
+ 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 ();
- _session->maybe_update_session_range(
- std::max(get_offset(), (ARDOUR::frameoffset_t) 0),
- std::max(get_offset() + get_duration(), (ARDOUR::frameoffset_t) 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 */
#endif
}
VtlUpdate();
+ GuiUpdate("video-available");
return true;
}
, 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);
return ok;
}
+bool
+VideoTimeLine::check_server_docroot ()
+{
+ bool ok = true;
+ char url[1024];
+ std::vector<std::vector<std::string> > lines;
+
+ if (video_server_url.find("/localhost:") == string::npos) {
+ return true;
+ }
+ snprintf(url, sizeof(url), "%s%src?format=csv"
+ , video_server_url.c_str()
+ , (video_server_url.length()>0 && video_server_url.at(video_server_url.length()-1) == '/')?"":"/"
+ );
+ char *res=a3_curl_http_get(url, NULL);
+ if (!res) {
+ return false;
+ }
+
+ ParseCSV(std::string(res), lines);
+ if ( lines.empty()
+ || lines.at(0).empty()
+ || lines.at(0).at(0) != video_get_docroot(Config)) {
+ warning << string_compose(
+ _("Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually means that the video server was not started by ardour and uses a different document-root."),
+ PROGRAM_NAME, video_get_docroot(Config), lines.at(0).at(0))
+ << endmsg;
+ ok = false; // TODO allow to override
+ }
+ free(res);
+ return ok;
+}
+
void
VideoTimeLine::gui_update(std::string const & t) {
/* this is to be called via GuiUpdate() only. */
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);
+ } else if (t == "video-available") {
+ editor->set_close_video_sensitive(true);
+ } else if (t == "video-unavailable") {
+ editor->set_close_video_sensitive(false);
}
}
void
VideoTimeLine::set_height (int height) {
+ if (_session && bar_height != height) {
+ _session->set_dirty ();
+ }
bar_height = height;
flush_local_cache();
}
void
VideoTimeLine::vmon_update () {
if (vmonitor && vmonitor->is_started()) {
- vmonitor->set_offset( GOFFSET); // TODO proper re-init xjadeo w/o restart not just offset.
+ vmonitor->set_offset(video_offset); // TODO proper re-init xjadeo w/o restart not just offset.
}
}
, 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);
}
}
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->set_offset(video_offset);
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 0
+ /* unused for now.
+ * the idea is to selective ignore certain monitor window
+ * states if xjadeo is not running on the same host as ardour.
+ * However with the removal of the video-monitor-startup-dialogue
+ * (git rev 5a4d0fff0) these settings are currently not accessible.
+ */
int xj_settings_mask = vmonitor->restore_settings_mask();
if (_session) {
/* load mask from Session */
if (node) {
const XMLProperty* prop = node->property (X_("mask"));
if (prop) {
- xj_settings_mask = atoi(prop->value().c_str());
+ xj_settings_mask = atoi(prop->value());
}
}
}
- 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());
+ vmonitor->restore_settings_mask(xj_settings_mask);
#endif
- vmonitor->restore_settings_mask(open_video_monitor_dialog->xj_settings_mask());
- } else {
- 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) {
+ vmonitor->save_session();
delete vmonitor;
}
- GuiUpdate("set-xjadeo-active-off");
vmonitor=0;
- if (reopen_vmonitor) {
+ GuiUpdate("set-xjadeo-active-off");
+ if (reopen_vmonitor) {
reopen_vmonitor=false;
- open_video_monitor(false);
- }
-}
-
-/*
-void
-VideoTimeLine::clear_video_monitor_session_state ()
-{
- if (vmonitor) {
- vmonitor->clear_session_state();
+ open_video_monitor();
} else {
- if (!_session) { return; }
- XMLNode* node = new XMLNode(X_("XJSettings"));
- _session->add_extra_xml (*node);
- _session->set_dirty ();
+ if (_session) {
+ _session->set_dirty ();
+ }
}
}
-*/
void
VideoTimeLine::manual_seek_video_monitor (framepos_t pos)
if (!vmonitor) { return; }
if (!vmonitor->is_started()) { return; }
if (!vmonitor->synced_by_manual_seeks()) { return; }
- vmonitor->manual_seek(pos, false, GOFFSET); // XXX -> set offset in xjadeo
+ vmonitor->manual_seek(pos, false, video_offset); // XXX -> set offset in xjadeo
}
-
-#endif /* WITH_VIDEOTIMELINE */
projects / ardour.git / blobdiff