Fix tests again on Windows.

[libdcp.git] / src / dcp.h

diff --git a/src/dcp.h b/src/dcp.h
index c08ccf38e0b0e2db5eafe0852d13e4c9c1d4b5d0..7d3d670aa891a4e35e20ea2736d059f70554d64d 100644 (file)
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -95,6 +95,9 @@ public:
        DCP (DCP const&) = delete;
        DCP& operator= (DCP const&) = delete;
 
+       DCP (DCP &&);
+       DCP& operator= (DCP &&);
+
        /** Read a DCP.  This method does not do any deep checking of the DCP's validity, but
         *  if it comes across any bad things it will do one of two things.
         *
@@ -179,12 +182,16 @@ public:
                return _pkls;
        }
 
-       boost::optional<boost::filesystem::path> asset_map_path() {
+       boost::optional<boost::filesystem::path> asset_map_file() const {
                if (!_asset_map) {
                        return {};
                }
 
-               return _asset_map->path();
+               return _asset_map->file();
+       }
+
+       boost::optional<AssetMap> asset_map() const {
+               return _asset_map;
        }
 
        static std::vector<boost::filesystem::path> directories_from_files (std::vector<boost::filesystem::path> files);