X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel.h;h=083ecd0e8f5a7c814e154d8f6bdaf3709abb0611;hb=d95eacd3851a20e52202465ec22b4f72a4983dc8;hp=041e1ca117e5cb1180e75e1b516e87c04efa6c70;hpb=cbee0d077e698541afcea82a95bafcea5245ab89;p=libdcp.git diff --git a/src/reel.h b/src/reel.h index 041e1ca1..083ecd0e 100644 --- a/src/reel.h +++ b/src/reel.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of libdcp. @@ -39,7 +39,6 @@ #include "ref.h" #include #include -#include namespace cxml { class Node; @@ -99,7 +98,7 @@ public: return _main_markers; } - std::list > closed_captions () const { + std::vector> closed_captions () const { return _closed_captions; } @@ -111,7 +110,7 @@ public: void add (std::shared_ptr asset); - std::list > assets () const; + std::vector> assets () const; xmlpp::Element* write_to_cpl (xmlpp::Element* node, Standard standard) const; @@ -121,14 +120,14 @@ public: void add (DecryptedKDM const &); - void resolve_refs (std::list >); + void resolve_refs (std::vector>); private: std::shared_ptr _main_picture; std::shared_ptr _main_sound; std::shared_ptr _main_subtitle; std::shared_ptr _main_markers; - std::list > _closed_captions; + std::vector> _closed_captions; std::shared_ptr _atmos; };