#include "ardour_ui.h"
#include "public_editor.h"
#include "gui_thread.h"
-#include "utils.h"
#include "utils_videotl.h"
#include "rgb_macros.h"
#include "video_timeline.h"
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)
}
/* 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;
#endif
if (getenv("XJREMOTE")) {
_xjadeo_bin = getenv("XJREMOTE");
- } else if (find_file_in_search_path (Searchpath(Glib::getenv("PATH")), X_("xjremote"), xjadeo_file_path)) {
+ } 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
- /* old xjadeo, typo in key <= 0.7.6 */
- else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSSxjadeo", 0, KEY_READ, &key))
+ 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));
+ _xjadeo_bin = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", NULL));
}
- else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\xjadeo", 0, KEY_READ, &key))
+ else if ( (ERROR_SUCCESS == RegOpenKeyExA (HKEY_LOCAL_MACHINE, "Software\\RSS\\xjadeo", 0, KEY_READ | KEY_WOW64_32KEY, &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));
+ _xjadeo_bin = std::string(g_build_filename(Glib::locale_to_utf8(tmp).c_str(), "xjadeo.exe", NULL));
}
- else if (program_files && Glib::file_test(g_build_filename(program_files, "xjadeo", "xjadeo.exe", 0), Glib::FILE_TEST_EXISTS))
+ else if (program_files && Glib::file_test(g_build_filename(program_files, "xjadeo", "xjadeo.exe", NULL), Glib::FILE_TEST_EXISTS))
{
- _xjadeo_bin = std::string(g_build_filename(program_files, "harvid", "xjadeo.exe", 0));
+ _xjadeo_bin = std::string(g_build_filename(program_files, "xjadeo", "xjadeo.exe", NULL));
}
-#endif
- /* generic fallbacks to try */
-#ifdef __APPLE__
- 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
+ /* 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_("");
warning << _("Video-monitor 'xjadeo' was not found. Please install http://xjadeo.sf.net/ "
"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;
+ }
+
+ version_check.wait ();
+ 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