#include "pbd/convert.h"
#include "ardour/session_directory.h"
-#ifdef PLATFORM_WINDOWS
-#include <windows.h>
-#include <shlobj.h> // CSIDL_*
-#include "pbd/windows_special_dirs.h"
-#endif
-
#include "ardour_ui.h"
+#include "ardour_http.h"
#include "public_editor.h"
#include "gui_thread.h"
#include "utils_videotl.h"
#include "rgb_macros.h"
#include "video_timeline.h"
+#include "video_tool_paths.h"
#include <gtkmm2ext/utils.h>
#include <pthread.h>
#include <curl/curl.h>
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
return;
}
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg;
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;
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_("POSIX"));
- 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_("POSIX"));
+ LocaleGuard lg;
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;
}
, 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);
}
void
VideoTimeLine::find_xjadeo () {
- std::string xjadeo_file_path;
-#ifdef PLATFORM_WINDOWS
- HKEY key;
- DWORD size = PATH_MAX;
- char tmp[PATH_MAX+1];
- const char *program_files = PBD::get_win_special_folder (CSIDL_PROGRAM_FILES);
-#endif
- if (getenv("XJREMOTE")) {
- _xjadeo_bin = getenv("XJREMOTE");
- } else if (find_file (Searchpath(Glib::getenv("PATH")), X_("xjremote"), xjadeo_file_path)) {
- _xjadeo_bin = xjadeo_file_path;
- } else if (find_file (Searchpath(Glib::getenv("PATH")), X_("xjadeo"), xjadeo_file_path)) {
- _xjadeo_bin = xjadeo_file_path;
- }
-#ifdef __APPLE__
- else if (Glib::file_test(X_("/Applications/Xjadeo.app/Contents/MacOS/xjremote"), Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_EXECUTABLE)) {
- _xjadeo_bin = X_("/Applications/Xjadeo.app/Contents/MacOS/xjremote");
- }
- 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");
- }
-#endif
-#ifdef PLATFORM_WINDOWS
- else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\xjadeo", 0, KEY_READ, &key))
- && (ERROR_SUCCESS == RegQueryValueExA (key, "Install_Dir", 0, NULL, reinterpret_cast<LPBYTE>(tmp), &size))
- )
- {
- _xjadeo_bin = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", 0));
- }
- else if (program_files && Glib::file_test(g_build_filename(program_files, "xjadeo", "xjadeo.exe", 0), Glib::FILE_TEST_EXISTS))
- {
- _xjadeo_bin = std::string(g_build_filename(program_files, "xjadeo", "xjadeo.exe", 0));
- }
- /* generic fallback to try */
- else if (Glib::file_test(X_("C:\\Program Files\\xjadeo\\xjadeo.exe"), Glib::FILE_TEST_EXISTS)) {
- _xjadeo_bin = X_("C:\\Program Files\\xjadeo\\xjadeo.exe");
- }
-#endif
- else {
- _xjadeo_bin = X_("");
+ 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"
"see also http://manual.ardour.org/video-timeline/setup/")
<< endmsg;
}
+
if (found_xjadeo ()) {
ARDOUR::SystemExec version_check(_xjadeo_bin, X_("--version"));
xjadeo_version = "";
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);
/* 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