AnnotationText is (I believe) optional.

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index e13c502858b5b07de840a138cf0a3b0d9d77f142..5c230e06848805ab114bc032a734a32983d78d54 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -26,12 +26,12 @@
 
 #include "mxf_asset.h"
 #include "types.h"
+#include "metadata.h"
 
 namespace libdcp
 {
 
 class SoundFrame;
-
 class SoundAsset;
 
 class SoundAssetWriter
@@ -45,7 +45,7 @@ public:
 private:
        friend class SoundAsset;
 
-       SoundAssetWriter (SoundAsset *);
+       SoundAssetWriter (SoundAsset *, MXFMetadata const &);
 
        /* no copy construction */
        SoundAssetWriter (SoundAssetWriter const &);
@@ -64,6 +64,7 @@ private:
        bool _finalized;
        int _frames_written;
        int _frame_buffer_offset;
+       MXFMetadata _metadata;
 };
 
 /** @brief An asset made up of WAV files */
@@ -78,7 +79,6 @@ public:
         *  @param progress Signal to inform of progress.
         *  @param fps Frames per second.
         *  @param intrinsic_duration Length of the whole asset in frames.
-        *  @param start_frame Frame in the source to start writing from.
         *  Note that this is different to entry_point in that the asset will contain no data before start_frame.
         */
        SoundAsset (
@@ -88,7 +88,7 @@ public:
                boost::signals2::signal<void (float)>* progress,
                int fps,
                int intrinsic_duration,
-               int start_frame
+               MXFMetadata const & metadata = MXFMetadata ()
                );
 
        /** Construct a SoundAsset, generating the MXF from some WAV files.
@@ -99,8 +99,6 @@ public:
         *  @param progress Signal to inform of progress.
         *  @param fps Frames per second.
         *  @param intrinsic_duration Length of the whole asset in frames.
-        *  @param start_frame Frame in the source to start writing from.
-        *  Note that this is different to entry_point in that the asset will contain no data before start_frame.
         *  @param channels Number of audio channels.
         */
        SoundAsset (
@@ -110,8 +108,8 @@ public:
                boost::signals2::signal<void (float)>* progress,
                int fps,
                int intrinsic_duration,
-               int start_frame,
-               int channels
+               int channels,
+               MXFMetadata const & metadata = MXFMetadata ()
                );
 
        SoundAsset (
@@ -127,14 +125,14 @@ public:
                int sampling_rate
                );
 
-       boost::shared_ptr<SoundAssetWriter> start_write ();
+       boost::shared_ptr<SoundAssetWriter> start_write (MXFMetadata const & metadata = MXFMetadata ());
        
        /** Write details of this asset to a CPL stream.
         *  @param s Stream.
         */
        void write_to_cpl (std::ostream& s) const;
 
-       bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;
+       bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const;
 
        boost::shared_ptr<const SoundFrame> get_frame (int n) const;
        
@@ -147,13 +145,12 @@ public:
        }
 
 private:
-       void construct (boost::function<std::string (Channel)> get_path);
+       void construct (boost::function<std::string (Channel)> get_path, MXFMetadata const &);
        std::string path_from_channel (Channel channel, std::vector<std::string> const & files);
 
        /** Number of channels in the asset */
        int _channels;
        int _sampling_rate;
-       int _start_frame;
 };
 
 }