#include "ardour/tempo.h"
#include "pbd/file_utils.h"
-#include "pbd/convert.h"
+#include "pbd/types_convert.h"
+#include "ardour/filesystem_paths.h"
#include "ardour/session_directory.h"
#include "ardour_ui.h"
+#include "ardour_http.h"
#include "public_editor.h"
#include "gui_thread.h"
-#include "utils.h"
#include "utils_videotl.h"
#include "rgb_macros.h"
#include "video_timeline.h"
#include <pthread.h>
#include <curl/curl.h>
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace Timecode;
using namespace VideoUtils;
-VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Group *vbg, int initial_height)
+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;
video_offset_lock = false;
video_aspect_ratio = 4.0/3.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);
video_filename = "";
local_file = true;
video_file_fps = 25.0;
- flush_frames = false;
+ _flush_frames = false;
vmonitor=0;
reopen_vmonitor=false;
find_xjadeo();
+ find_harvid();
+ video_server_url = video_get_server_url(Config);
+ server_docroot = video_get_docroot(Config);
VtlUpdate.connect (*this, invalidator (*this), boost::bind (&PublicEditor::queue_visual_videotimeline_update, editor), gui_context());
GuiUpdate.connect (*this, invalidator (*this), boost::bind (&VideoTimeLine::gui_update, this, _1), gui_context());
return;
}
- LocaleGuard lg (X_("POSIX"));
-
XMLNode* node = new XMLNode(X_("Videomonitor"));
if (!node) return;
- node->add_property (X_("active"), (vmonitor && vmonitor->is_started())?"yes":"no");
+ node->set_property (X_("active"), (vmonitor && vmonitor->is_started()));
_session->add_extra_xml (*node);
if (vmonitor) {
/* 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"));
+ node->set_property (X_("id"), id());
+ node->set_property (X_("Height"), editor->get_videotl_bar_height());
+ node->set_property (X_("VideoOffsetLock"), video_offset_lock);
+ node->set_property (X_("VideoOffset"), video_offset);
+ node->set_property (X_("AutoFPS"), auto_set_session_fps);
}
/* close and save settings */
sessionsave.disconnect();
close_video_monitor();
- remove_frames();
+ remove_frames ();
video_filename = "";
video_duration = 0;
GuiUpdate("set-xjadeo-sensitive-off");
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));
XMLNode* node = _session->extra_xml (X_("Videotimeline"));
set_id(*node);
- const XMLProperty* proph = node->property (X_("Height"));
- if (proph) {
- editor->set_video_timeline_height(atoi(proph->value()));
+ int height;
+ if (node->get_property (X_("Height"), height)) {
+ editor->set_video_timeline_height(height);
}
#if 0 /* TODO THINK: set FPS first time only ?! */
- const XMLProperty* propasfps = node->property (X_("AutoFPS"));
+ XMLProperty const * 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());
+ if (node->get_property (X_("VideoOffset"), video_offset)) {
video_offset_p = video_offset;
}
- const XMLProperty* proplock = node->property (X_("VideoOffsetLock"));
- if (proplock) {
- video_offset_lock = atoi(proplock->value())?true:false;
- }
+ node->get_property (X_("VideoOffsetLock"), video_offset_lock);
+ node->get_property (X_("LocalFile"), local_file);
- const XMLProperty* localfile = node->property (X_("LocalFile"));
- if (localfile) {
- local_file = atoi(localfile->value())?true:false;
+ std::string filename;
+ if (node->get_property (X_("Filename"), filename)) {
+ video_file_info (filename, local_file);
}
- 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) {
+ bool active;
+ if (node->get_property (X_("active"), active) && active && found_xjadeo () &&
+ !video_filename.empty () && local_file) {
open_video_monitor();
}
}
int
VideoTimeLine::set_state (const XMLNode& node, int /*version*/)
{
- LocaleGuard lg (X_("POSIX"));
- const XMLProperty* propoffset = node.property (X_("VideoOffset"));
- if (propoffset) {
- video_offset = atoll(propoffset->value());
- }
+ node.get_property (X_("VideoOffset"), video_offset);
ARDOUR_UI::instance()->flush_videotimeline_cache(true);
return 0;
}
VideoTimeLine::get_state ()
{
XMLNode* node = new XMLNode (X_("Videotimeline"));
- LocaleGuard lg (X_("POSIX"));
- node->add_property (X_("VideoOffset"), video_offset_p);
+ node->set_property (X_("VideoOffset"), video_offset_p);
return *node;
}
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; }
}
}
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;
}
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)
/* 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;
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 (flush_frames) {
- remove_frames();
- flush_frames=false;
+ if (_flush_frames) {
+ remove_frames ();
+ _flush_frames = false;
}
while (video_frames.size() < visible_video_frames) {
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;
#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;
{
local_file = local;
- if (filename.at(0) == G_DIR_SEPARATOR || !local_file) {
+ if (Glib::path_is_absolute(filename) || !local_file)
+ {
video_filename = filename;
} else {
video_filename = Glib::build_filename (_session->session_directory().video_path(), filename);
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)) {
, 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);
+ char* res = ArdourCurl::http_get (url, NULL, false);
if (res) {
if (strstr(res, "status: ok, online.")) { ok = true; }
free(res);
, 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);
+ char* res = ArdourCurl::http_get (url, NULL, false);
if (!res) {
return false;
}
|| 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."),
+ _("Video-server docroot mismatch. %1: '%2', video-server: '%3'. This usually means that the video server was not started by %1 and uses a different document-root."),
PROGRAM_NAME, video_get_docroot(Config), lines.at(0).at(0))
<< endmsg;
ok = false; // TODO allow to override
void
VideoTimeLine::flush_local_cache () {
- flush_frames = true;
+ _flush_frames = true;
vmon_update();
}
, 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);
+ char* res = ArdourCurl::http_get (url, NULL, false);
if (res) {
free (res);
}
}
/* video-monitor for this timeline */
+void
+VideoTimeLine::xjadeo_readversion (std::string d, size_t /* s */) {
+ xjadeo_version += d;
+}
+
void
VideoTimeLine::find_xjadeo () {
- std::string xjadeo_file_path;
- if (getenv("XJREMOTE")) {
- _xjadeo_bin = strdup(getenv("XJREMOTE")); // XXX TODO: free it?!
- } else if (find_file_in_search_path (Searchpath(Glib::getenv("PATH")), X_("xjremote"), xjadeo_file_path)) {
- _xjadeo_bin = xjadeo_file_path;
+ if (!ArdourVideoToolPaths::xjadeo_exe(_xjadeo_bin)) {
+ warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
+ "(a custom path to xjadeo can be specified by setting the XJREMOTE environment variable. "
+ "It should point to an application compatible with xjadeo's remote-control interface 'xjremote').\n"
+ "\n"
+ "see also http://manual.ardour.org/video-timeline/setup/")
+ << endmsg;
+ }
+
+ if (found_xjadeo ()) {
+ ARDOUR::SystemExec version_check(_xjadeo_bin, X_("--version"));
+ xjadeo_version = "";
+ version_check.ReadStdout.connect_same_thread (*this, boost::bind (&VideoTimeLine::xjadeo_readversion, this, _1 ,_2));
+ version_check.Terminated.connect_same_thread (*this, boost::bind (&VideoTimeLine::xjadeo_readversion, this, "\n" ,1));
+ if (version_check.start(2)) {
+ warning << _(
+ "Video-monitor 'xjadeo' cannot be launched."
+ ) << endmsg;
+ _xjadeo_bin = X_("");
+ return;
+ }
+
+#ifdef PLATFORM_WINDOWS
+ version_check.wait (); // 40ms timeout
+#else
+ version_check.wait (WNOHANG);
+#endif
+
+ int timeout = 300;
+ while (xjadeo_version.empty() && --timeout) {
+ Glib::usleep(10000);
+ }
+
+ bool v_ok = false;
+ size_t vo = xjadeo_version.find(" version ");
+ if (vo != string::npos) {
+ int v_major, v_minor, v_micro;
+ if(sscanf(xjadeo_version.substr(vo + 9, string::npos).c_str(),"%d.%d.%d",
+ &v_major, &v_minor, &v_micro) == 3)
+ {
+ 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/"
+ ) << endmsg;
+ }
+ }
+}
+
+void
+VideoTimeLine::harvid_readversion (std::string d, size_t /* s */) {
+ harvid_version += d;
+}
+
+void
+VideoTimeLine::find_harvid () {
+ /* This is mainly for the benefit of the windows version:
+ * harvid >= 0.8.2 allows an empty docroot and ardour can
+ * pass the drive-letter along.
+ *
+ * It is a chicken/egg w.r.t. the video-server dialog
+ * but needed for default preferences and initial settings.
+ */
+ std::string harvid_bin;
+ if (VideoUtils::harvid_version != 0x0) {
+ return;
+ }
+ if (!ArdourVideoToolPaths::harvid_exe(harvid_bin)) {
+ return;
}
- else if (Glib::file_test(X_("/Applications/Jadeo.app/Contents/MacOS/xjremote"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
- _xjadeo_bin = X_("/Applications/Jadeo.app/Contents/MacOS/xjremote");
+ if (harvid_bin.empty ()) {
+ return;
}
- /* TODO: win32: allow to configure PATH to xjremote */
- else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjremote.exe"), Glib::FILE_TEST_EXISTS)) {
- _xjadeo_bin = X_("C:\\Program Files\\xjadeo\\xjremote.exe");
+ ARDOUR::SystemExec version_check(harvid_bin, X_("--version"));
+ harvid_version = "";
+ version_check.ReadStdout.connect_same_thread (*this, boost::bind (&VideoTimeLine::harvid_readversion, this, _1 ,_2));
+ version_check.Terminated.connect_same_thread (*this, boost::bind (&VideoTimeLine::harvid_readversion, this, "\n" ,1));
+ if (version_check.start(2)) {
+ return;
}
- else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjremote.bat"), Glib::FILE_TEST_EXISTS)) {
- _xjadeo_bin = X_("C:\\Program Files\\xjadeo\\xjremote.bat");
+
+#ifdef PLATFORM_WINDOWS
+ version_check.wait (); // 40ms timeout
+#else
+ version_check.wait (WNOHANG);
+#endif
+
+ int timeout = 300;
+ while (harvid_version.empty() && --timeout) {
+ Glib::usleep(10000);
}
- else {
- _xjadeo_bin = X_("");
- warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
- "(a custom path to xjadeo can be specified by setting the XJREMOTE environment variable. "
- "It should point to an application compatible with xjadeo's remote-control interface 'xjremote').")
- << endmsg;
+
+ size_t vo = harvid_version.find("harvid v");
+ if (vo != string::npos) {
+ int v_major, v_minor, v_micro;
+ if(sscanf(harvid_version.substr(vo + 8, string::npos).c_str(),"%d.%d.%d",
+ &v_major, &v_minor, &v_micro) == 3)
+ {
+ VideoUtils::harvid_version = (v_major << 16) | (v_minor << 8) | v_micro;
+ info << "harvid version: "<< hex << VideoUtils::harvid_version << endmsg;
+ }
}
}
/* load mask from Session */
XMLNode* node = _session->extra_xml (X_("XJRestoreSettings"));
if (node) {
- const XMLProperty* prop = node->property (X_("mask"));
+ XMLProperty const * prop = node->property (X_("mask"));
if (prop) {
xj_settings_mask = atoi(prop->value());
}
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 ();
+ bool active;
+ if (node->get_property (X_("active"), active) && !active) {
+ _session->set_dirty ();
+ }
} else {
_session->set_dirty ();
}
}
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; }
projects / ardour.git / blobdiff