X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fvideo_timeline.cc;h=a1dd4bcfbbc89edaa03078c2886e3c7798703ed9;hb=69229f74e038c5418d3f791cb9204c64e042d93a;hp=536d57afe6fc6227e5047ad72488cb0572e93b31;hpb=fa71d82dda08558caf4a9c5102016f2746883d10;p=ardour.git diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index 536d57afe6..a1dd4bcfbb 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -28,10 +28,10 @@ #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" +#include "video_tool_paths.h" #include #include @@ -45,7 +45,7 @@ using namespace PBD; 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) @@ -85,7 +85,7 @@ VideoTimeLine::save_session () return; } - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg (X_("C")); XMLNode* node = new XMLNode(X_("Videomonitor")); if (!node) return; @@ -142,8 +142,8 @@ VideoTimeLine::set_session (ARDOUR::Session *s) 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 (X_("C")); XMLNode* node = _session->extra_xml (X_("Videotimeline")); @@ -224,7 +224,7 @@ VideoTimeLine::save_undo () int VideoTimeLine::set_state (const XMLNode& node, int /*version*/) { - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg (X_("C")); const XMLProperty* propoffset = node.property (X_("VideoOffset")); if (propoffset) { video_offset = atoll(propoffset->value()); @@ -237,7 +237,7 @@ XMLNode& VideoTimeLine::get_state () { XMLNode* node = new XMLNode (X_("Videotimeline")); - LocaleGuard lg (X_("POSIX")); + LocaleGuard lg (X_("C")); node->add_property (X_("VideoOffset"), video_offset_p); return *node; } @@ -356,16 +356,20 @@ VideoTimeLine::update_video_timeline() 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; } @@ -452,7 +456,8 @@ VideoTimeLine::video_file_info (std::string filename, bool local) { 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); @@ -583,7 +588,7 @@ VideoTimeLine::check_server_docroot () || 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 @@ -712,31 +717,61 @@ VideoTimeLine::set_video_server_docroot(std::string vsr) { } /* 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; - } - 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"); - } - /* 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"); - } - 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"); - } - 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').") + "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; + } + + 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