Remove _finalized check from picture writer too.

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 17767b3a04fe4bf52047dcfb67c5f396bed232bb..b95b34be6ed5666b4b0c1b4c2108818a204fc5b1 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -24,39 +24,45 @@
  *  @brief An asset made up of PCM audio data files
  */
 
-#include "AS_DCP.h"
 #include "mxf_asset.h"
 #include "types.h"
+#include "metadata.h"
 
 namespace libdcp
 {
 
 class SoundFrame;
-
 class SoundAsset;
 
 class SoundAssetWriter
 {
 public:
-       ~SoundAssetWriter ();
-
        void write (float const * const *, int);
        void finalize ();
 
 private:
        friend class SoundAsset;
 
-       SoundAssetWriter (SoundAsset *);
+       SoundAssetWriter (SoundAsset *, MXFMetadata const &);
+
+       /* no copy construction */
+       SoundAssetWriter (SoundAssetWriter const &);
+       SoundAssetWriter& operator= (SoundAssetWriter const &);
+       
        void write_current_frame ();
 
+       /* do this with an opaque pointer so we don't have to include
+          ASDCP headers
+       */
+          
+       struct ASDCPState;
+       boost::shared_ptr<ASDCPState> _state;
+
        SoundAsset* _asset;
        bool _finalized;
        int _frames_written;
        int _frame_buffer_offset;
-       ASDCP::PCM::MXFWriter _mxf_writer;
-       ASDCP::PCM::FrameBuffer _frame_buffer;
-       ASDCP::WriterInfo _writer_info;
-       ASDCP::PCM::AudioDescriptor _audio_desc;
+       MXFMetadata _metadata;
 };
 
 /** @brief An asset made up of WAV files */
@@ -71,7 +77,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 (
@@ -81,7 +86,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.
@@ -92,8 +97,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 (
@@ -103,8 +106,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 (
@@ -120,14 +123,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;
        
@@ -140,13 +143,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;
 };
 
 }