# Use distro-provided FFmpeg on Arch
deps = []
- deps.append(('libdcp', 'v1.8.82'))
+ deps.append(('libdcp', 'd70c44e87632a69a2b8bc90db7ca4b06b7aa611d'))
deps.append(('libsub', 'v1.6.44'))
deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
deps.append(('rtaudio', 'f619b76'))
#include "dcpomatic_log.h"
#include "config.h"
#include "exceptions.h"
+#include <dcp/filesystem.h>
#include <dcp/raw_convert.h>
#include <glib.h>
#include <boost/algorithm/string.hpp>
boost::filesystem::path
directory_containing_executable ()
{
- return boost::filesystem::canonical(boost::dll::program_location()).parent_path();
+ return dcp::filesystem::canonical(boost::dll::program_location()).parent_path();
}
run_ffprobe(boost::filesystem::path content, boost::filesystem::path out, bool err, string args)
{
auto path = directory_containing_executable () / "ffprobe";
- if (!boost::filesystem::exists(path)) {
+ if (!dcp::filesystem::exists(path)) {
/* This is a hack but we need ffprobe during tests */
path = "/Users/ci/workspace/bin/ffprobe";
}
#include "dcpomatic_assert.h"
#include "util.h"
#include <dcp/file.h>
+#include <dcp/filesystem.h>
#include <dcp/raw_convert.h>
#include <glib.h>
extern "C" {
wcscat(command, L" \"");
- MultiByteToWideChar(CP_UTF8, 0, boost::filesystem::canonical(content).make_preferred().string().c_str(), -1, tmp, sizeof(tmp));
+ MultiByteToWideChar(CP_UTF8, 0, dcp::filesystem::canonical(content).make_preferred().string().c_str(), -1, tmp, sizeof(tmp));
wcscat(command, tmp);
wcscat(command, L"\"");
#include "ext.h"
#include "nanomsg.h"
#include <dcp/file.h>
+#include <dcp/filesystem.h>
#ifdef DCPOMATIC_LINUX
#include <linux/fs.h>
using namespace boost::filesystem;
for (auto dir: dirs) {
- dir = dcp::fix_long_path(dir);
+ dir = dcp::filesystem::fix_long_path(dir);
for (auto path: directory_iterator(dir)) {
if (is_directory(path)) {
count({path}, total_bytes);
copy (boost::filesystem::path from, boost::filesystem::path to, uint64_t& total_remaining, uint64_t total, vector<CopiedFile>& copied_files, Nanomsg* nanomsg)
{
LOG_DISK ("Copy %1 -> %2", from.string(), to.generic_string());
- from = dcp::fix_long_path (from);
+ from = dcp::filesystem::fix_long_path(from);
using namespace boost::filesystem;
#include "lib/signal_manager.h"
#include "lib/util.h"
#include "lib/version.h"
+#include <dcp/filesystem.h>
#include <dcp/warnings.h>
#include <wx/cmdline.h>
#include <wx/wx.h>
boost::optional<boost::filesystem::path> get () const
{
auto const dcp = boost::filesystem::path(wx_to_std(GetPath()));
- if (!boost::filesystem::exists(dcp / "ASSETMAP") && !boost::filesystem::exists(dcp / "ASSETMAP.xml")) {
+ if (!dcp::filesystem::exists(dcp / "ASSETMAP") && !dcp::filesystem::exists(dcp / "ASSETMAP.xml")) {
error_dialog (nullptr, _("No ASSETMAP or ASSETMAP.xml found in this folder. Please choose a DCP folder."));
return {};
}