summaryrefslogtreecommitdiff
path: root/src/dcp.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-08 15:40:19 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-08 15:40:19 +0100
commit9e871b60fc7430650f239cfd9291ab65cb5aeba8 (patch)
treecfc77d0079fef2aeeb896fe6c7e50716fc696fa1 /src/dcp.h
parent656519fb0028c90fd16c1cc13103177ccd52664d (diff)
Require only DCP::add() for the CPL; other assets found by looking in the CPL.
Diffstat (limited to 'src/dcp.h')
-rw-r--r--src/dcp.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/dcp.h b/src/dcp.h
index 46ae2b34..03f0a802 100644
--- a/src/dcp.h
+++ b/src/dcp.h
@@ -82,14 +82,10 @@ public:
*/
bool equals (DCP const & other, EqualityOptions options, NoteHandler note) const;
- void add (boost::shared_ptr<Asset> asset);
+ void add (boost::shared_ptr<CPL> cpl);
std::list<boost::shared_ptr<CPL> > cpls () const;
-
- /** @return All this DCP's assets (note that CPLs are assets) */
- std::list<boost::shared_ptr<Asset> > assets () const {
- return _assets;
- }
+ std::list<boost::shared_ptr<Asset> > assets () const;
bool encrypted () const;
@@ -123,8 +119,8 @@ private:
/** the directory that we are writing to */
boost::filesystem::path _directory;
- /** the assets that make up this DCP */
- std::list<boost::shared_ptr<Asset> > _assets;
+ /** the CPLs that make up this DCP */
+ std::list<boost::shared_ptr<CPL> > _cpls;
};
}