Merge branch 'master' of /home/carl/git/libdcp

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 95efccd6378fe19338385d7b3d244a7cce4fb906..9e6e75cf538d65d11ad1c0f7d724f894d9044139 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -30,7 +30,41 @@
 namespace libdcp
 {
 
-class SoundFrame;      
+class SoundFrame;
+
+class SoundAsset;
+
+class SoundAssetWriter
+{
+public:
+       ~SoundAssetWriter ();
+
+       void write (float const * const *, int);
+       void finalize ();
+
+private:
+       friend class SoundAsset;
+
+       SoundAssetWriter (SoundAsset *);
+
+       /* 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;
+};
 
 /** @brief An asset made up of WAV files */
 class SoundAsset : public MXFAsset
@@ -44,7 +78,7 @@ 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 (
                std::vector<std::string> const & files,
@@ -52,8 +86,7 @@ public:
                std::string mxf_name,
                boost::signals2::signal<void (float)>* progress,
                int fps,
-               int intrinsic_duration,
-               int start_frame
+               int intrinsic_duration
                );
 
        /** Construct a SoundAsset, generating the MXF from some WAV files.
@@ -64,7 +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.
         *  @param channels Number of audio channels.
         */
        SoundAsset (
@@ -74,23 +106,30 @@ public:
                boost::signals2::signal<void (float)>* progress,
                int fps,
                int intrinsic_duration,
-               int start_frame,
                int channels
                );
 
+       SoundAsset (
+               std::string directory,
+               std::string mxf_name
+               );
+
        SoundAsset (
                std::string directory,
                std::string mxf_name,
                int fps,
-               int intrinsic_duration
+               int channels,
+               int sampling_rate
                );
+
+       boost::shared_ptr<SoundAssetWriter> start_write ();
        
        /** 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;
        
@@ -109,7 +148,6 @@ private:
        /** Number of channels in the asset */
        int _channels;
        int _sampling_rate;
-       int _start_frame;
 };
 
 }