X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fdcp.h;h=d4f6aff9aba9a64a377da1caed718eb789b4b1f8;hb=147cbe31f62fd6087a9a70f0ce2cd4a69b06dbbf;hp=6ab57bcb9152322248271b263373c5c0c5ef5e44;hpb=4678bf06d71c8a18c489912dabf8aca312ab8b6b;p=libdcp.git diff --git a/src/dcp.h b/src/dcp.h index 6ab57bcb..d4f6aff9 100644 --- a/src/dcp.h +++ b/src/dcp.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "types.h" namespace xmlpp { @@ -39,119 +39,149 @@ namespace libdcp { class Asset; +class PictureAsset; +class SoundAsset; +class SubtitleAsset; +class Reel; +class AssetMap; -/** @class DCP dcp.h libdcp/dcp.h - * @brief A class to create a DCP. - */ - -class DCP +class CPL { public: - /** Construct a DCP. - * @param directory Directory to write files to. - * @param name Name. - * @param content_kind Content kind. - * @param fps Frames per second. - * @param length Length in frames. - */ - DCP (std::string directory, std::string name, ContentKind content_kind, int fps, int length); + CPL (std::string directory, std::string name, ContentKind content_kind, int length, int frames_per_second); + CPL (std::string directory, std::string file, boost::shared_ptr asset_map, bool require_mxfs = true); - DCP (std::string directory); + void add_reel (boost::shared_ptr reel); + + /** @return the length in frames */ + int length () const { + return _length; + } - /** Add a sound asset. - * @param files Pathnames of WAV files to use in the order Left, Right, - * Centre, Lfe (sub), Left surround, Right surround; not all files need - * to be present. + /** @return the type of the content, used by media servers + * to categorise things (e.g. feature, trailer, etc.) */ - void add_sound_asset (std::vector const & files); + ContentKind content_kind () const { + return _content_kind; + } - /** Add a sound asset. - * @param get_path Functor to get the path to the WAV for a given channel. - * @param channels Number of channels. + std::list > reels () const { + return _reels; + } + + /** @return the CPL's name, as will be presented on projector + * media servers and theatre management systems. */ - void add_sound_asset (sigc::slot get_path, int channels); + std::string name () const { + return _name; + } + + /** @return the number of frames per second */ + int frames_per_second () const { + return _fps; + } - /** Add a picture asset. - * @param files Pathnames of JPEG2000 files, in frame order. - * @param width Width of images in pixels. - * @param height Height of images in pixels. + std::list > assets () const; + + bool equals (CPL const & other, EqualityOptions options, std::list& notes) const; + + void write_xml () const; + void write_to_assetmap (std::ostream& s) const; + void write_to_pkl (std::ostream& s) const; + +private: + std::string _directory; + /** the name of the DCP */ + std::string _name; + /** the content kind of the CPL */ + ContentKind _content_kind; + /** length in frames */ + mutable int _length; + /** frames per second */ + int _fps; + /** reels */ + std::list > _reels; + + std::string _uuid; + mutable std::string _digest; +}; + +/** @class DCP dcp.h libdcp/dcp.h + * @brief A class to create or read a DCP. + */ + +class DCP +{ +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. + * + * @param directory Directory containing the DCP's files. */ - void add_picture_asset (std::vector const & files, int width, int height); + DCP (std::string directory); - /** Add a picture asset. - * @param get_path Functor to get path to the JPEG2000 for a given frame. - * @param width Width of images in pixels. - * @param height Height of images in pixels. + /** Read an existing DCP's data. + * + * The DCP's XML metadata will be examined, and you can then look at the contents + * of the DCP. + * + * @param require_mxfs true to throw an exception if MXF files are missing; setting to false + * can be useful for testing, but normally it should be set to true. */ - void add_picture_asset (sigc::slot get_path, int width, int height); + void read (bool require_mxfs = true); /** Write the required XML files to the directory that was * passed into the constructor. */ void write_xml () const; - std::string name () const { - return _name; - } - - ContentKind content_kind () const { - return _content_kind; - } + /** Compare this DCP with another, according to various options. + * @param other DCP to compare this one to. + * @param options Options to define just what "equality" means. + * @param notes Filled in with notes about differences. + * @return true if the DCPs are equal according to EqualityOptions, otherwise false. + */ + bool equals (DCP const & other, EqualityOptions options, std::list& notes) const; - int frames_per_second () const { - return _fps; - } + void add_cpl (boost::shared_ptr cpl); - int length () const { - return _length; + std::list > cpls () const { + return _cpls; } - std::list equals (DCP const & other, EqualityType type) const; - /** Emitted with a parameter between 0 and 1 to indicate progress * for long jobs. */ - sigc::signal1 Progress; + boost::signals2::signal Progress; private: - /** Write the CPL file. - * @param cpl_uuid UUID to use. - * @return CPL pathname. - */ - std::string write_cpl (std::string cpl_uuid) const; - /** Write the PKL file. * @param pkl_uuid UUID to use. - * @param cpl_uuid UUID of the CPL file. - * @param cpl_digest SHA digest of the CPL file. - * @param cpl_length Length of the CPL file in bytes. */ - std::string write_pkl (std::string pkl_uuid, std::string cpl_uuid, std::string cpl_digest, int cpl_length) const; + std::string write_pkl (std::string pkl_uuid) const; /** Write the VOLINDEX file */ void write_volindex () const; /** Write the ASSETMAP file. - * @param cpl_uuid UUID of our CPL. - * @param cpl_length Length of our CPL in bytes. * @param pkl_uuid UUID of our PKL. * @param pkl_length Length of our PKL in bytes. */ - void write_assetmap (std::string cpl_uuid, int cpl_length, std::string pkl_uuid, int pkl_length) const; + void write_assetmap (std::string pkl_uuid, int pkl_length) const; + + std::list > assets () const; + + struct Files { + std::list cpls; + std::string pkl; + std::string asset_map; + }; /** the directory that we are writing to */ std::string _directory; - /** the name of the DCP */ - std::string _name; - /** the content kind of the DCP */ - ContentKind _content_kind; - /** frames per second */ - int _fps; - /** length in frames */ - int _length; - /** assets */ - std::list > _assets; + std::list > _cpls; }; }