Bump libdcp for new filesystem wrappers.

diff --git a/cscript b/cscript
index 189d363c56dbfef88372e095566926e826c60e15..8a656c1cdf788ee089310e85440ad496ebf2f465 100644 (file)
--- a/cscript
+++ b/cscript
@@ -508,7 +508,7 @@ def dependencies(target, options):
         # Use distro-provided FFmpeg on Arch
         deps = []
 
-    deps.append(('libdcp', 'v1.8.82'))
+    deps.append(('libdcp', 'v1.8.83'))
     deps.append(('libsub', 'v1.6.44'))
     deps.append(('leqm-nrt', '30dcaea1373ac62fba050e02ce5b0c1085797a23'))
     deps.append(('rtaudio', 'f619b76'))

diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index 0f25732f2aa3e667050998f94e4cfc07f578542d..5596e6ecbc3a42f51628aa677288a12d61ad7aa4 100644 (file)
--- 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 9480f77545fbaa5f8f3e2165b5a3164a5045a89a..9181b6c8abf1deb8861a21c65b3db63d4d62a883 100644 (file)
--- 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 2ef3df6bb932f53a6a2b09ffb88e1d0135d9f956..25946df73234c027f4ffa5552e4608b7aa908157 100644 (file)
--- 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;
 

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 28799013f700f5e643abf455b83c2e191f4dd933..5941d6d7038d8d508cc15d92cdb3e454cd77a921 100644 (file)
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -39,6 +39,7 @@
 #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>
@@ -85,7 +86,7 @@ public:
        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 {};
                }