Use a typedef for a note-taking functor.

[libdcp.git] / src / reel_asset.cc

diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index 978f1dee9de4609eab104eeddf33203bd45af6db..037a39780e55a4a5f43eee630da1955ce77611a6 100644 (file)
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -100,7 +100,7 @@ ReelAsset::cpl_node_attribute (Standard) const
 }
 
 bool
-ReelAsset::equals (shared_ptr<const ReelAsset> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> note) const
+ReelAsset::equals (shared_ptr<const ReelAsset> other, EqualityOptions opt, NoteHandler note) const
 {
        if (_annotation_text != other->_annotation_text) {
                stringstream s;
@@ -115,7 +115,7 @@ ReelAsset::equals (shared_ptr<const ReelAsset> other, EqualityOptions opt, boost
        }
 
        if (_intrinsic_duration != other->_intrinsic_duration) {
-               note (DCP_ERROR, "Reel: intrinsic durations differ");
+               note (DCP_ERROR, String::compose ("Reel: intrinsic durations differ (%1 vs %2)", _intrinsic_duration, other->_intrinsic_duration));
                return false;
        }