Merge master.

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 7b9c65a74ffe67b3a2f8cadd92bf78c1739ceee9..a587b55101fbd7ec030df5999cc5a56e8679941c 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -76,7 +76,10 @@ public:
         *  @param mxf_name Name of MXF file to create.
         *  @param progress Signal to inform of progress.
         *  @param fps Frames per second.
+        *  @param length Length in frames.
+        *  @param start_frame Frame in the source to start writing from.
         *  @param intrinsic_duration Length of the whole asset in frames.
+        *  @param encrypted true if asset should be encrypted.
         *  Note that this is different to entry_point in that the asset will contain no data before start_frame.
         */
        SoundAsset (
@@ -86,6 +89,7 @@ public:
                boost::signals2::signal<void (float)>* progress,
                int fps,
                int intrinsic_duration,
+               bool encrypted,
                MXFMetadata const & metadata = MXFMetadata ()
                );
 
@@ -98,6 +102,7 @@ public:
         *  @param fps Frames per second.
         *  @param intrinsic_duration Length of the whole asset in frames.
         *  @param channels Number of audio channels.
+        *  @param encrypted true if asset should be encrypted.
         */
        SoundAsset (
                boost::function<std::string (Channel)> get_path,
@@ -107,6 +112,7 @@ public:
                int fps,
                int intrinsic_duration,
                int channels,
+               bool encrypted,
                MXFMetadata const & metadata = MXFMetadata ()
                );
 
@@ -143,6 +149,7 @@ public:
        }
 
 private:
+       std::string key_type () const;
        void construct (boost::function<std::string (Channel)> get_path, MXFMetadata const &);
        std::string path_from_channel (Channel channel, std::vector<std::string> const & files);