X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.h;h=3189c0674471d08141bbb45d4e301155dc38936f;hb=147cbe31f62fd6087a9a70f0ce2cd4a69b06dbbf;hp=3f42a522b3a3953704fcf63b11df44b4efe3e884;hpb=1a3818e1c76321095553c91f846478ca44ffb14d;p=libdcp.git

diff --git a/src/sound_asset.h b/src/sound_asset.h
index 3f42a522..3189c067 100644
--- 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
@@ -87,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;
 	
@@ -100,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 */