A few more untested bits.

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 3f42a522b3a3953704fcf63b11df44b4efe3e884..4633b9a7683aa57288cf3e37b8baa392b5bb8984 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -44,14 +44,16 @@ public:
         *  @param progress Signal to inform of progress.
         *  @param fps Frames per second.
         *  @param length Length in frames.
+        *  @param encrypted true if asset should be encrypted.
         */
        SoundAsset (
                std::vector<std::string> const & files,
                std::string directory,
                std::string mxf_name,
-               sigc::signal1<void, float>* progress,
+               boost::signals2::signal<void (float)>* progress,
                int fps,
-               int length
+               int length,
+               bool encrypted
                );
 
        /** Construct a SoundAsset, generating the MXF from some WAV files.
@@ -63,15 +65,17 @@ public:
         *  @param fps Frames per second.
         *  @param length Length in frames.
         *  @param channels Number of audio channels.
+        *  @param encrypted true if asset should be encrypted.
         */
        SoundAsset (
-               sigc::slot<std::string, Channel> get_path,
+               boost::function<std::string (Channel)> get_path,
                std::string directory,
                std::string mxf_name,
-               sigc::signal1<void, float>* progress,
+               boost::signals2::signal<void (float)>* progress,
                int fps,
                int length,
-               int channels
+               int channels,
+               bool encrypted
                );
 
        SoundAsset (
@@ -87,7 +91,7 @@ public:
         */
        void write_to_cpl (std::ostream& s) const;
 
-       std::list<std::string> equals (boost::shared_ptr<const Asset> other, EqualityOptions opt) const;
+       bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;
 
        boost::shared_ptr<const SoundFrame> get_frame (int n) const;
        
@@ -100,7 +104,7 @@ public:
        }
 
 private:
-       void construct (sigc::slot<std::string, Channel> get_path);
+       void construct (boost::function<std::string (Channel)> get_path);
        std::string path_from_channel (Channel channel, std::vector<std::string> const & files);
 
        /** Number of channels in the asset */