Use an enum class for Marker.

[libdcp.git] / src / reel.h

diff --git a/src/reel.h b/src/reel.h
index 0c73e69f9f788fb8149f98396670ec508a6f2416..083ecd0e8f5a7c814e154d8f6bdaf3709abb0611 100644 (file)
--- a/src/reel.h
+++ b/src/reel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #ifndef LIBDCP_REEL_H
@@ -23,9 +37,8 @@
 #include "key.h"
 #include "types.h"
 #include "ref.h"
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <boost/function.hpp>
-#include <list>
 
 namespace cxml {
        class Node;
@@ -42,64 +55,80 @@ class ReelAsset;
 class ReelPictureAsset;
 class ReelSoundAsset;
 class ReelSubtitleAsset;
+class ReelMarkersAsset;
+class ReelClosedCaptionAsset;
 class ReelAtmosAsset;
 class Content;
 
-/** @brief A reel within a DCP; the part which actually refers to picture, sound and subtitle data */
+/** @brief A reel within a DCP; the part which actually refers to picture, sound, subtitle, marker and Atmos data */
 class Reel : public Object
 {
 public:
        Reel () {}
 
        Reel (
-               boost::shared_ptr<ReelPictureAsset> picture,
-               boost::shared_ptr<ReelSoundAsset> sound = boost::shared_ptr<ReelSoundAsset> (),
-               boost::shared_ptr<ReelSubtitleAsset> subtitle = boost::shared_ptr<ReelSubtitleAsset> (),
-               boost::shared_ptr<ReelAtmosAsset> atmos = boost::shared_ptr<ReelAtmosAsset> ()
+               std::shared_ptr<ReelPictureAsset> picture,
+               std::shared_ptr<ReelSoundAsset> sound = std::shared_ptr<ReelSoundAsset> (),
+               std::shared_ptr<ReelSubtitleAsset> subtitle = std::shared_ptr<ReelSubtitleAsset> (),
+               std::shared_ptr<ReelMarkersAsset> markers = std::shared_ptr<ReelMarkersAsset> (),
+               std::shared_ptr<ReelAtmosAsset> atmos = std::shared_ptr<ReelAtmosAsset> ()
                )
                : _main_picture (picture)
                , _main_sound (sound)
                , _main_subtitle (subtitle)
+               , _main_markers (markers)
                , _atmos (atmos)
        {}
 
-       explicit Reel (boost::shared_ptr<const cxml::Node>);
+       explicit Reel (std::shared_ptr<const cxml::Node>);
 
-       boost::shared_ptr<ReelPictureAsset> main_picture () const {
+       std::shared_ptr<ReelPictureAsset> main_picture () const {
                return _main_picture;
        }
 
-       boost::shared_ptr<ReelSoundAsset> main_sound () const {
+       std::shared_ptr<ReelSoundAsset> main_sound () const {
                return _main_sound;
        }
 
-       boost::shared_ptr<ReelSubtitleAsset> main_subtitle () const {
+       std::shared_ptr<ReelSubtitleAsset> main_subtitle () const {
                return _main_subtitle;
        }
 
-       boost::shared_ptr<ReelAtmosAsset> atmos () const {
+       std::shared_ptr<ReelMarkersAsset> main_markers () const {
+               return _main_markers;
+       }
+
+       std::vector<std::shared_ptr<ReelClosedCaptionAsset>> closed_captions () const {
+               return _closed_captions;
+       }
+
+       std::shared_ptr<ReelAtmosAsset> atmos () const {
                return _atmos;
        }
 
        int64_t duration () const;
 
-       void add (boost::shared_ptr<ReelAsset> asset);
+       void add (std::shared_ptr<ReelAsset> asset);
+
+       std::vector<std::shared_ptr<ReelAsset>> assets () const;
 
-       void write_to_cpl (xmlpp::Element* node, Standard standard) const;
+       xmlpp::Element* write_to_cpl (xmlpp::Element* node, Standard standard) const;
 
        bool encrypted () const;
 
-       bool equals (boost::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler notes) const;
+       bool equals (std::shared_ptr<const Reel> other, EqualityOptions opt, NoteHandler notes) const;
 
        void add (DecryptedKDM const &);
 
-       void resolve_refs (std::list<boost::shared_ptr<Asset> >);
+       void resolve_refs (std::vector<std::shared_ptr<Asset>>);
 
 private:
-       boost::shared_ptr<ReelPictureAsset> _main_picture;
-       boost::shared_ptr<ReelSoundAsset> _main_sound;
-       boost::shared_ptr<ReelSubtitleAsset> _main_subtitle;
-       boost::shared_ptr<ReelAtmosAsset> _atmos;
+       std::shared_ptr<ReelPictureAsset> _main_picture;
+       std::shared_ptr<ReelSoundAsset> _main_sound;
+       std::shared_ptr<ReelSubtitleAsset> _main_subtitle;
+       std::shared_ptr<ReelMarkersAsset> _main_markers;
+       std::vector<std::shared_ptr<ReelClosedCaptionAsset>> _closed_captions;
+       std::shared_ptr<ReelAtmosAsset> _atmos;
 };
 
 }