Some OS X build fixes.

[libdcp.git] / src / asset.h

diff --git a/src/asset.h b/src/asset.h
index b7b2065b78447625861fd1867d07b94ab02fdc59..2712dcb889d08538b7b1cfbff9c910961a8c38aa 100644 (file)
--- a/src/asset.h
+++ b/src/asset.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,87 +18,69 @@
 */
 
 /** @file  src/asset.h
- *  @brief Parent class for assets of DCPs.
- */
+ *  @brief Asset class.
+ */ 
 
 #ifndef LIBDCP_ASSET_H
 #define LIBDCP_ASSET_H
 
-#include <string>
-#include <boost/filesystem.hpp>
-#include <sigc++/sigc++.h>
+#include "object.h"
 #include "types.h"
+#include <boost/filesystem.hpp>
+#include <boost/function.hpp>
+#include <boost/bind.hpp>
 
-namespace ASDCP {
-       class WriterInfo;
+namespace xmlpp {
+       class Node;
 }
 
-namespace libdcp
-{
+namespace dcp {
 
-/** @brief Parent class for assets of DCPs
+/** @class Asset
+ *  @brief Parent class for DCP assets, i.e. picture/sound/subtitles and CPLs.
  *
- *  These are collections of pictures or sound.
+ *  Note that this class is not used for ReelAssets; those are just for the metadata
+ *  that gets put into &lt;Reel&gt;s.
  */
-class Asset
+class Asset : public Object
 {
 public:
-       /** Construct an Asset.
-        *  @param directory Directory where MXF file is.
-        *  @param mxf_name Name of MXF file.
-        *  @param progress Signal to inform of progress.
-        *  @param fps Frames per second.
-        *  @param length Length in frames.
-        */
-       Asset (std::string directory, std::string mxf_path, sigc::signal1<void, float>* progress, int fps, int length);
+       Asset ();
+       Asset (boost::filesystem::path file);
 
-       /** Write details of the asset to a CPL stream.
-        *  @param s Stream.
-        */
-       virtual void write_to_cpl (std::ostream& s) const = 0;
+       virtual bool equals (
+               boost::shared_ptr<const Asset> other,
+               EqualityOptions opt,
+               NoteHandler note
+               ) const;
 
-       /** Write details of the asset to a PKL stream.
-        *  @param s Stream.
+       /** Write details of the asset to a ASSETMAP.
+        *  @param node Parent node.
         */
-       void write_to_pkl (std::ostream& s) const;
+       void write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const;
 
-       /** Write details of the asset to a ASSETMAP stream.
-        *  @param s Stream.
+       /** Write details of the asset to a PKL AssetList node.
+        *  @param node Parent node.
+        *  @param standard Standard to use.
         */
-       void write_to_assetmap (std::ostream& s) const;
+       void write_to_pkl (xmlpp::Node* node, Standard standard) const;
+
+       boost::filesystem::path file () const {
+               return _file;
+       }
 
-       virtual std::list<std::string> equals (boost::shared_ptr<const Asset> other, EqualityOptions opt) const;
+       void set_file (boost::filesystem::path file) const;
 
-       int length () const;
+       /** @return the hash of this asset's file */
+       std::string hash (boost::function<void (float)> progress = 0) const;
 
 protected:
-       friend class PictureAsset;
-       friend class SoundAsset;
-       
-       /** Fill in a ADSCP::WriteInfo struct.
-        *  @param w struct to fill in.
-        */
-       void fill_writer_info (ASDCP::WriterInfo* w) const;
-
-       boost::filesystem::path mxf_path () const;
-       std::string digest () const;
-
-       /** Directory that our MXF file is in */
-       std::string _directory;
-       /** Name of our MXF file */
-       std::string _mxf_name;
-       /** Signal to emit to report progress */
-       sigc::signal1<void, float>* _progress;
-       /** Frames per second */
-       int _fps;
-       /** Length in frames */
-       int _length;
-       /** Our UUID */
-       std::string _uuid;
-
-private:       
-       /** Digest of our MXF */
-       mutable std::string _digest;
+       virtual std::string pkl_type (Standard standard) const = 0;
+
+       /** The most recent disk file used to read or write this asset; may be empty */
+       mutable boost::filesystem::path _file;
+       /** Hash of _file, or empty if the hash has not yet been computed */
+       mutable std::string _hash;
 };
 
 }