#include "ardour/session_directory.h"
#include "ardour_ui.h"
+#include "ardour_http.h"
#include "public_editor.h"
#include "gui_thread.h"
#include "utils_videotl.h"
#include <pthread.h>
#include <curl/curl.h>
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
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;
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_("C"));
+ LocaleGuard lg;
XMLNode* node = new XMLNode(X_("Videomonitor"));
if (!node) return;
if (!_session) { return ; }
_session->SessionSaveUnderway.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
- LocaleGuard lg (X_("C"));
+ LocaleGuard lg;
XMLNode* node = _session->extra_xml (X_("Videotimeline"));
set_id(*node);
- const XMLProperty* proph = node->property (X_("Height"));
+ XMLProperty const * 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"));
+ 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"));
+ XMLProperty const * propoffset = node->property (X_("VideoOffset"));
if (propoffset) {
video_offset = atoll(propoffset->value());
video_offset_p = video_offset;
}
- const XMLProperty* proplock = node->property (X_("VideoOffsetLock"));
+ XMLProperty const * proplock = node->property (X_("VideoOffsetLock"));
if (proplock) {
video_offset_lock = atoi(proplock->value())?true:false;
}
- const XMLProperty* localfile = node->property (X_("LocalFile"));
+ XMLProperty const * localfile = node->property (X_("LocalFile"));
if (localfile) {
local_file = atoi(localfile->value())?true:false;
}
- const XMLProperty* propf = node->property (X_("Filename"));
+ XMLProperty const * 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"));
+ XMLProperty const * prop = node->property (X_("active"));
if (prop && prop->value() == "yes" && found_xjadeo() && !video_filename.empty() && local_file) {
open_video_monitor();
}
int
VideoTimeLine::set_state (const XMLNode& node, int /*version*/)
{
- LocaleGuard lg (X_("C"));
- const XMLProperty* propoffset = node.property (X_("VideoOffset"));
+ LocaleGuard lg;
+ XMLProperty const * propoffset = node.property (X_("VideoOffset"));
if (propoffset) {
video_offset = atoll(propoffset->value());
}
VideoTimeLine::get_state ()
{
XMLNode* node = new XMLNode (X_("Videotimeline"));
- LocaleGuard lg (X_("C"));
+ LocaleGuard lg;
node->add_property (X_("VideoOffset"), video_offset_p);
return *node;
}
, 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);
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);
if (!res) {
return false;
}
, 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);
if (res) {
free (res);
}
return;
}
- version_check.wait ();
+#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);
{
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.8.0 or later. http://xjadeo.sf.net/"
+ "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;
+ }
+ if (harvid_bin.empty ()) {
+ return;
+ }
+ 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;
+ }
+
+#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);
+ }
+
+ 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;
+ }
+ }
+}
+
void
VideoTimeLine::open_video_monitor() {
if (!found_xjadeo()) return;
/* 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"));
+ XMLProperty const * prop = node->property (X_("active"));
if (prop && prop->value() != "yes") _session->set_dirty ();
} else {
_session->set_dirty ();
projects / ardour.git / blobdiff