Prepare for windows video support on all drive-letters.
* add harvid version detection (>= 0.8.2 is needed) * special case empty docroot (for windows, pass drive-letter)
This commit is contained in:
parent
9ddf80225b
commit
bbd7b2aeea
@ -174,6 +174,7 @@ typedef uint64_t microseconds_t;
|
||||
#include "time_info_box.h"
|
||||
#include "timers.h"
|
||||
#include "utils.h"
|
||||
#include "utils_videotl.h"
|
||||
#include "video_server_dialog.h"
|
||||
#include "add_video_dialog.h"
|
||||
#include "transcode_video_dialog.h"
|
||||
@ -4379,15 +4380,18 @@ ARDOUR_UI::start_video_server (Gtk::Window* float_window, bool popup_msg)
|
||||
|
||||
std::string icsd_exec = video_server_dialog->get_exec_path();
|
||||
std::string icsd_docroot = video_server_dialog->get_docroot();
|
||||
if (icsd_docroot.empty()) {
|
||||
#ifndef PLATFORM_WINDOWS
|
||||
icsd_docroot = X_("/");
|
||||
#else
|
||||
icsd_docroot = X_("C:\\");
|
||||
#endif
|
||||
if (icsd_docroot.empty()) {
|
||||
icsd_docroot = VideoUtils::video_get_docroot (Config);
|
||||
}
|
||||
#endif
|
||||
|
||||
GStatBuf sb;
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
if (VideoUtils::harvid_version >= 0x000802 && icsd_docroot.empty()) {
|
||||
/* OK, allow all drive letters */
|
||||
} else
|
||||
#endif
|
||||
if (g_lstat (icsd_docroot.c_str(), &sb) != 0 || !S_ISDIR(sb.st_mode)) {
|
||||
warning << _("Specified docroot is not an existing directory.") << endmsg;
|
||||
continue;
|
||||
|
@ -47,6 +47,8 @@ using namespace PBD;
|
||||
using namespace ARDOUR;
|
||||
using namespace VideoUtils;
|
||||
|
||||
unsigned int VideoUtils::harvid_version = 0x0;
|
||||
|
||||
bool
|
||||
VideoUtils::confirm_video_outfn (Gtk::Window& parent, std::string outfn, std::string docroot)
|
||||
{
|
||||
@ -111,7 +113,11 @@ VideoUtils::video_get_docroot (ARDOUR::RCConfiguration* config)
|
||||
#ifndef PLATFORM_WINDOWS
|
||||
return X_("/");
|
||||
#else
|
||||
return X_("C:\\");
|
||||
if (harvid_version >= 0x000802) { // 0.8.2
|
||||
return X_("");
|
||||
} else {
|
||||
return X_("C:\\");
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -34,6 +34,8 @@
|
||||
|
||||
namespace VideoUtils {
|
||||
|
||||
extern unsigned int harvid_version;
|
||||
|
||||
bool confirm_video_outfn (Gtk::Window& parent, std::string, std::string docroot="");
|
||||
std::string video_dest_dir (const std::string, const std::string);
|
||||
std::string video_dest_file (const std::string, const std::string);
|
||||
|
@ -101,6 +101,11 @@ VideoServerDialog::VideoServerDialog (Session* s)
|
||||
<< endmsg;
|
||||
}
|
||||
|
||||
#ifdef PLATFORM_WINDOWS
|
||||
if (VideoUtils::harvid_version >= 0x000802) {
|
||||
/* empty docroot -> all drive letters */
|
||||
} else
|
||||
#endif
|
||||
if (docroot_entry.get_text().empty()) {
|
||||
std::string docroot = Glib::path_get_dirname(_session->session_directory().root_path());
|
||||
if ((docroot.empty() || docroot.at(docroot.length()-1) != '/')) { docroot += "/"; }
|
||||
|
@ -68,6 +68,7 @@ VideoTimeLine::VideoTimeLine (PublicEditor *ed, ArdourCanvas::Container *vbg, in
|
||||
vmonitor=0;
|
||||
reopen_vmonitor=false;
|
||||
find_xjadeo();
|
||||
find_harvid();
|
||||
|
||||
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());
|
||||
@ -780,6 +781,61 @@ VideoTimeLine::find_xjadeo () {
|
||||
}
|
||||
}
|
||||
|
||||
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;
|
||||
|
@ -107,6 +107,7 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
|
||||
|
||||
std::string _xjadeo_bin;
|
||||
void find_xjadeo ();
|
||||
void find_harvid ();
|
||||
|
||||
|
||||
ARDOUR::frameoffset_t video_start_offset; /**< unit: audio-samples - video-file */
|
||||
@ -124,7 +125,9 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
|
||||
std::string server_docroot;
|
||||
|
||||
void xjadeo_readversion (std::string d, size_t s);
|
||||
void harvid_readversion (std::string d, size_t s);
|
||||
std::string xjadeo_version;
|
||||
std::string harvid_version;
|
||||
|
||||
typedef std::list<VideoImageFrame*> VideoFrames;
|
||||
VideoFrames video_frames;
|
||||
|
Loading…
Reference in New Issue
Block a user