Try to fix int/long confusion.

[libdcp.git] / src / asset.h

diff --git a/src/asset.h b/src/asset.h
index 7adf009087d0870abd5ef33d03c14837fabff4cc..214cc227e930385b5b9311727e4866392d01ff80 100644 (file)
--- a/src/asset.h
+++ b/src/asset.h
@@ -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.h
@@ -49,7 +63,7 @@ class Asset : public Object
 {
 public:
        Asset ();
-       Asset (boost::filesystem::path file);
+       explicit Asset (boost::filesystem::path file);
        Asset (std::string id, boost::filesystem::path file);
 
        virtual bool equals (
@@ -79,6 +93,8 @@ public:
        /** @return the hash of this asset's file */
        std::string hash (boost::function<void (float)> progress = 0) const;
 
+       void set_hash (std::string hash);
+
 protected:
 
        /** The most recent disk file used to read or write this asset; may be empty */
@@ -87,6 +103,7 @@ protected:
 private:
        friend struct ::asset_test;
 
+       /** @return type string for PKLs for this asset */
        virtual std::string pkl_type (Standard standard) const = 0;
 
        /** Hash of _file if it has been computed */