X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.h;h=fecf3cffebe3b1261881bf2b1961792059bec4aa;hb=3956d410a1fce4fe3b02cd7c52d9717e29371f3b;hp=1fa7ae0c65e71740fb1cb82ccbe0700edc9fe1b8;hpb=09e16aa3acf7878b54a4995a0be79890f26db09f;p=libdcp.git diff --git a/src/dcp.h b/src/dcp.h index 1fa7ae0c..fecf3cff 100644 --- a/src/dcp.h +++ b/src/dcp.h @@ -1,20 +1,34 @@ /* Copyright (C) 2012-2014 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of libdcp. + + libdcp 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. - This program is distributed in the hope that it will be useful, + libdcp is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - + along with libdcp. If not, see . + + 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. */ /** @file src/dcp.h @@ -25,8 +39,9 @@ #define LIBDCP_DCP_H #include "types.h" -#include "certificates.h" +#include "certificate.h" #include "metadata.h" +#include "name_format.h" #include #include #include @@ -41,41 +56,41 @@ namespace xmlpp { namespace dcp { -class Content; +class Content; class Reel; class CPL; class XMLMetadata; -class Signer; +class CertificateChain; class DecryptedKDM; class Asset; class DCPReadError; -namespace parse { - class AssetMap; -} - /** @class DCP * @brief A class to create or read a DCP. */ - + class DCP : public boost::noncopyable { public: /** Construct a DCP. You can pass an existing DCP's directory - * as the parameter, or a non-existant folder to create a new - * DCP in. + * as the parameter; alternatively, directory will be created + * if it does not exist. Note that if you pass an existing DCP + * into this constructor it will not be read until you call ::read(). * * @param directory Directory containing the DCP's files. */ - DCP (boost::filesystem::path directory); + explicit DCP (boost::filesystem::path directory); typedef std::list > ReadErrors; - + /** Read the DCP's structure into this object. * @param keep_going true to try to keep going in the face of (some) errors. * @param errors List of errors that will be added to if keep_going is true. + * @param ignore_incorrect_picture_mxf_type true to try loading MXF files marked as monoscopic + * as stereoscopic if the monoscopic load fails; fixes problems some 3D DCPs that (I think) + * have an incorrect descriptor in their MXF. */ - void read (bool keep_going = false, ReadErrors* errors = 0); + void read (bool keep_going = false, ReadErrors* errors = 0, bool ignore_incorrect_picture_mxf_type = false); /** Compare this DCP with another, according to various options. * @param other DCP to compare this one to. @@ -83,16 +98,12 @@ public: * @param note Functor to handle notes made by the equality operation. * @return true if the DCPs are equal according to EqualityOptions, otherwise false. */ - bool equals (DCP const & other, EqualityOptions options, boost::function note) const; + bool equals (DCP const & other, EqualityOptions options, NoteHandler note) const; - void add (boost::shared_ptr asset); + void add (boost::shared_ptr cpl); std::list > cpls () const; - - /** @return All this DCP's assets (note that CPLs are assets) */ - std::list > assets () const { - return _assets; - } + std::list > assets () const; bool encrypted () const; @@ -101,21 +112,30 @@ public: void write_xml ( Standard standard, XMLMetadata metadata = XMLMetadata (), - boost::shared_ptr signer = boost::shared_ptr () + boost::shared_ptr signer = boost::shared_ptr (), + NameFormat name_format = NameFormat("%t_%i") ); + void resolve_refs (std::list > assets); + + /** @return Standard of a DCP that was read in */ + boost::optional standard () const { + return _standard; + } + private: /** Write the PKL file. * @param pkl_uuid UUID to use. */ boost::filesystem::path write_pkl ( + std::string file, Standard standard, std::string pkl_uuid, XMLMetadata metadata, - boost::shared_ptr signer + boost::shared_ptr signer ) const; - + void write_volindex (Standard standard) const; /** Write the ASSETMAP file. @@ -126,8 +146,11 @@ private: /** the directory that we are writing to */ boost::filesystem::path _directory; - /** the assets that make up this DCP */ - std::list > _assets; + /** the CPLs that make up this DCP */ + std::list > _cpls; + + /** Standard of DCP that was read in */ + boost::optional _standard; }; }