More tests.

[libdcp.git] / src / cpl.h

diff --git a/src/cpl.h b/src/cpl.h
index 75b9d701c7ee5ae6cf14bf238cf3c2a520cca274..b85b0395aa047c43acd10300a21c26716005f5e2 100644 (file)
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -1,7 +1,7 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    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
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/cpl.h
+ *  @brief CPL class.
+ */
+
 #ifndef LIBDCP_CPL_H
 #define LIBDCP_CPL_H
 
@@ -34,7 +38,7 @@
 
 namespace dcp {
        
-class Content;
+class ReelAsset;
 class Reel;
 class XMLMetadata;
 class MXFMetadata;
@@ -51,7 +55,7 @@ public:
        CPL (boost::filesystem::path file);
 
        bool equals (
-               CPL const & other,
+               boost::shared_ptr<const Asset> other,
                EqualityOptions options,
                boost::function<void (NoteType, std::string)> note
                ) const;
@@ -91,14 +95,12 @@ public:
                return _reels;
        }
 
-       /** @return the Content in this CPL across all its reels
-        *  (Content is picture, sound and subtitles)
+       /** @return the ReelAssets in this CPL in all reels.
         */
-       std::list<boost::shared_ptr<const Content> > content () const;
+       std::list<boost::shared_ptr<const ReelAsset> > reel_assets () const;
 
        bool encrypted () const;
 
-       void set_mxf_keys (Key);
        void set_metadata (XMLMetadata m) {
                _metadata = m;
        }