Missing file.

[libdcp.git] / src / asset.cc

diff --git a/src/asset.cc b/src/asset.cc
index 052f73284b1e96d1fbe08acafa78c0a6c842a679..7d3a9813aa81b8a5be5546a63527eb782d69059f 100644 (file)
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/asset.cc
@@ -50,6 +64,10 @@ Asset::Asset (boost::filesystem::path file)
 
 }
 
+/** Create an Asset from a given file with a known ID.
+ *  @param file File name.
+ *  @param id ID.
+ */
 Asset::Asset (string id, boost::filesystem::path file)
        : Object (id)
        , _file (file)
@@ -60,11 +78,11 @@ Asset::Asset (string id, boost::filesystem::path file)
 void
 Asset::write_to_pkl (xmlpp::Node* node, boost::filesystem::path root, Standard standard) const
 {
-       DCP_ASSERT (!_file.empty ());
+       DCP_ASSERT (_file);
 
        optional<boost::filesystem::path> path = relative_to_root (
                boost::filesystem::canonical (root),
-               boost::filesystem::canonical (_file)
+               boost::filesystem::canonical (_file.get())
                );
 
        if (!path) {
@@ -78,18 +96,18 @@ Asset::write_to_pkl (xmlpp::Node* node, boost::filesystem::path root, Standard s
        asset->add_child("Id")->add_child_text ("urn:uuid:" + _id);
        asset->add_child("AnnotationText")->add_child_text (_id);
        asset->add_child("Hash")->add_child_text (hash ());
-       asset->add_child("Size")->add_child_text (raw_convert<string> (boost::filesystem::file_size (_file)));
+       asset->add_child("Size")->add_child_text (raw_convert<string> (boost::filesystem::file_size (_file.get())));
        asset->add_child("Type")->add_child_text (pkl_type (standard));
 }
 
 void
 Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const
 {
-       DCP_ASSERT (!_file.empty ());
+       DCP_ASSERT (_file);
 
        optional<boost::filesystem::path> path = relative_to_root (
                boost::filesystem::canonical (root),
-               boost::filesystem::canonical (_file)
+               boost::filesystem::canonical (_file.get())
                );
 
        if (!path) {
@@ -107,16 +125,16 @@ Asset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const
        chunk->add_child("Path")->add_child_text (path.get().generic_string());
        chunk->add_child("VolumeIndex")->add_child_text ("1");
        chunk->add_child("Offset")->add_child_text ("0");
-       chunk->add_child("Length")->add_child_text (raw_convert<string> (boost::filesystem::file_size (_file)));
+       chunk->add_child("Length")->add_child_text (raw_convert<string> (boost::filesystem::file_size (_file.get())));
 }
 
 string
 Asset::hash (function<void (float)> progress) const
 {
-       DCP_ASSERT (!_file.empty ());
+       DCP_ASSERT (_file);
 
        if (!_hash) {
-               _hash = make_digest (_file, progress);
+               _hash = make_digest (_file.get(), progress);
        }
 
        return _hash.get();