diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-10-05 00:20:27 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-10-09 23:38:25 +0200 |
| commit | 94a9473993b027b9368077009decbdd4322f90e3 (patch) | |
| tree | dca58767988a9f8c38521936992f46c9dc107194 /src/lib | |
| parent | e7a04275703b8cd54e1325d42f484ed7d0acab92 (diff) | |
Bump libdcp for new filesystem wrappers.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/cross_osx.cc | 5 | ||||
| -rw-r--r-- | src/lib/cross_windows.cc | 3 | ||||
| -rw-r--r-- | src/lib/ext.cc | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc index 0f25732f2..5596e6ecb 100644 --- a/src/lib/cross_osx.cc +++ b/src/lib/cross_osx.cc @@ -25,6 +25,7 @@ #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> @@ -84,7 +85,7 @@ cpu_info () 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(); } @@ -106,7 +107,7 @@ void 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"; } diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc index 9480f7754..9181b6c8a 100644 --- a/src/lib/cross_windows.cc +++ b/src/lib/cross_windows.cc @@ -30,6 +30,7 @@ #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" { @@ -166,7 +167,7 @@ run_ffprobe(boost::filesystem::path content, boost::filesystem::path out, bool e 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"\""); diff --git a/src/lib/ext.cc b/src/lib/ext.cc index 2ef3df6bb..25946df73 100644 --- a/src/lib/ext.cc +++ b/src/lib/ext.cc @@ -28,6 +28,7 @@ #include "ext.h" #include "nanomsg.h" #include <dcp/file.h> +#include <dcp/filesystem.h> #ifdef DCPOMATIC_LINUX #include <linux/fs.h> @@ -83,7 +84,7 @@ count (std::vector<boost::filesystem::path> dirs, uint64_t& total_bytes) 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); @@ -228,7 +229,7 @@ void 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; |