Fix handling of timing in SMPTE subtitles.

[libdcp.git] / src / reel.h

diff --git a/src/reel.h b/src/reel.h
index 8aaebf5135d42616f28546ebf30f93a7f89ae48c..278a0f916a23000c78e423c6a5a13b9909148af4 100644 (file)
--- a/src/reel.h
+++ b/src/reel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -34,13 +34,14 @@ namespace cxml {
 
 namespace dcp {
 
-class KDM;
+class DecryptedKDM;
 class ReelAsset;
 class ReelPictureAsset;
 class ReelSoundAsset;
 class ReelSubtitleAsset;
+class Content;
 
-/** @brief A reel within a DCP; the part which actually contains picture, sound and subtitle data */   
+/** @brief A reel within a DCP; the part which actually refers to picture, sound and subtitle data */  
 class Reel : public Object
 {
 public:
@@ -76,11 +77,11 @@ public:
 
        bool encrypted () const;
 
-       void set_mxf_keys (dcp::Key);
-       
-       bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, boost::function<void (NoteType, std::string)> notes) const;
+       bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler notes) const;
+
+       void add (DecryptedKDM const &);
 
-       void add_kdm (KDM const &);
+       void resolve_refs (std::list<boost::shared_ptr<Object> >);
 
 private:
        boost::shared_ptr<ReelPictureAsset> _main_picture;