Add Subtitle::set_text()

[libdcp.git] / src / picture_asset.h

diff --git a/src/picture_asset.h b/src/picture_asset.h
index d1b097fab6d49b9e757a77a46f9b5729445c6e0b..b404abd2e5d0bb897d23391adcd3e520e4291d5f 100644 (file)
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -29,6 +29,12 @@
 #include "util.h"
 #include "metadata.h"
 
+namespace ASDCP {
+       namespace JP2K {
+               struct PictureDescriptor;
+       }
+}
+
 namespace libdcp
 {
 
@@ -41,14 +47,18 @@ class PictureAsset : public MXFAsset
 {
 public:
        /** Construct a PictureAsset.
-        *  This class will not write anything to disk in this constructor, but subclasses may.
         *  
         *  @param directory Directory where MXF file is.
         *  @param mxf_name Name of MXF file.
         */
-       PictureAsset (boost::filesystem::path directory, std::string mxf_name);
+       PictureAsset (boost::filesystem::path directory, boost::filesystem::path mxf_name);
 
        /** Start a progressive write to this asset.
+        *  The following parameters must be set up (if required) before calling this:
+        *      Interop mode (set_interop)
+        *      Edit rate    (set_edit_rate)
+        *      MXF Metadata (set_metadata)
+        *      
         *  @param overwrite true to overwrite an existing MXF file; in this mode, writing can be resumed to a partially-written MXF; false if the
         *  MXF file does not exist.
         */
@@ -58,8 +68,6 @@ public:
        virtual void create (std::vector<boost::filesystem::path> const &) {}
        virtual void create (boost::function<boost::filesystem::path (int)>) {}
        
-       bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
-
        Size size () const {
                return _size;
        }
@@ -68,15 +76,23 @@ public:
                _size = s;
        }
 
-       void write_to_cpl (xmlpp::Element *, bool) const;
+       void write_to_cpl (xmlpp::Element *) const;
 
-protected:     
+protected:
+
+       std::string asdcp_kind () const {
+               return "Picture";
+       }
 
        bool frame_buffer_equals (
                int frame, EqualityOptions opt, boost::function<void (NoteType, std::string)> note,
                uint8_t const * data_A, unsigned int size_A, uint8_t const * data_B, unsigned int size_B
                ) const;
 
+       bool descriptor_equals (
+               ASDCP::JP2K::PictureDescriptor const & a, ASDCP::JP2K::PictureDescriptor const & b, boost::function<void (NoteType, std::string)>
+               ) const;
+
        /** picture size in pixels */
        Size _size;
 
@@ -84,49 +100,6 @@ private:
        std::string key_type () const;
        virtual int edit_rate_factor () const = 0;
 };
-
-/** A 2D (monoscopic) picture asset */
-class MonoPictureAsset : public PictureAsset
-{
-public:
-       MonoPictureAsset (boost::filesystem::path directory, std::string mxf_name);
-
-       void read ();
-       void create (std::vector<boost::filesystem::path> const & files);
-       void create (boost::function<boost::filesystem::path (int)> get_path);
-
-       /** Start a progressive write to a MonoPictureAsset */
-       boost::shared_ptr<PictureAssetWriter> start_write (bool);
-
-       boost::shared_ptr<const MonoPictureFrame> get_frame (int n) const;
-       bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
-
-private:
-       boost::filesystem::path path_from_list (int f, std::vector<boost::filesystem::path> const & files) const;
-       void construct (boost::function<boost::filesystem::path (int)>, bool, MXFMetadata const &);
-       std::string cpl_node_name () const;
-       int edit_rate_factor () const;
-};
-
-/** A 3D (stereoscopic) picture asset */       
-class StereoPictureAsset : public PictureAsset
-{
-public:
-       StereoPictureAsset (boost::filesystem::path directory, std::string mxf_name);
-
-       void read ();
-       
-       /** Start a progressive write to a StereoPictureAsset */
-       boost::shared_ptr<PictureAssetWriter> start_write (bool);
-
-       boost::shared_ptr<const StereoPictureFrame> get_frame (int n) const;
-       bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
-
-private:
-       std::string cpl_node_name () const;
-       std::pair<std::string, std::string> cpl_node_attribute (bool) const;
-       int edit_rate_factor () const;
-};
        
 
 }