Try to add basic decryption support to dcpdiff.

[libdcp.git] / src / cpl.cc

diff --git a/src/cpl.cc b/src/cpl.cc
index 3599231daad1420b1acb201568667f6237514623..b0fc8d77bd8ef3a7f0bebf8a7221caf14928b55b 100644 (file)
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -17,23 +17,18 @@
 
 */
 
-#include "raw_convert.h"
 #include "cpl.h"
 #include "util.h"
-#include "mono_picture_mxf.h"
-#include "stereo_picture_mxf.h"
-#include "sound_mxf.h"
-#include "subtitle_content.h"
 #include "reel.h"
 #include "metadata.h"
 #include "signer.h"
-#include "exceptions.h"
 #include "xml.h"
-#include "compose.hpp"
 #include "reel_picture_asset.h"
 #include "reel_sound_asset.h"
 #include "reel_subtitle_asset.h"
 #include "local_time.h"
+#include "dcp_assert.h"
+#include "compose.hpp"
 #include <libxml/parser.h>
 
 using std::string;
@@ -176,7 +171,7 @@ CPL::reel_assets () const
 }
        
 bool
-CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
+CPL::equals (shared_ptr<const Asset> other, EqualityOptions opt, NoteHandler note) const
 {
        shared_ptr<const CPL> other_cpl = dynamic_pointer_cast<const CPL> (other);
        if (!other_cpl) {
@@ -256,7 +251,7 @@ CPL::pkl_type (Standard standard) const
        case SMPTE:
                return "text/xml";
        default:
-               assert (false);
+               DCP_ASSERT (false);
        }
 }