Use signals2 rather than sigc++

[libdcp.git] / src / sound_asset.h

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 84a941cd70f3ca7363d0b54ef3144685d49f4a9a..3189c0674471d08141bbb45d4e301155dc38936f 100644 (file)
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -49,7 +49,7 @@ public:
                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
                );
@@ -65,10 +65,10 @@ public:
         *  @param channels Number of audio channels.
         */
        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
@@ -78,6 +78,7 @@ public:
                std::string directory,
                std::string mxf_name,
                int fps,
+               int entry_point,
                int length
                );
        
@@ -86,7 +87,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;
        
@@ -99,7 +100,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 */