X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.h;h=7c29b85887c82e55791fdc85209125adc198ac53;hb=4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad;hp=444eb9ae5ebb5ae1aac34932440025c92c3f8b43;hpb=034feb503b0a38eb82c21ae8d9f83522fc63a25c;p=dcpomatic.git diff --git a/src/lib/playlist.h b/src/lib/playlist.h index 444eb9ae5..7c29b8588 100644 --- a/src/lib/playlist.h +++ b/src/lib/playlist.h @@ -26,6 +26,7 @@ #include "ffmpeg_content.h" #include "audio_mapping.h" #include "util.h" +#include "frame_rate_change.h" class Content; class FFmpegContent; @@ -38,18 +39,15 @@ class Job; class Film; class Region; -/** @class Playlist - * @brief A set of content files (video and audio), with knowledge of how they should be arranged into - * a DCP. - * - * This class holds Content objects, and it knows how they should be arranged. - */ - struct ContentSorter { bool operator() (boost::shared_ptr a, boost::shared_ptr b); }; +/** @class Playlist + * @brief A set of Content objects with knowledge of how they should be arranged into + * a DCP. + */ class Playlist : public boost::noncopyable { public: @@ -57,7 +55,7 @@ public: ~Playlist (); void as_xml (xmlpp::Node *); - void set_from_xml (boost::shared_ptr, boost::shared_ptr, int, std::list &); + void set_from_xml (boost::shared_ptr, cxml::ConstNodePtr, int, std::list &); void add (boost::shared_ptr); void remove (boost::shared_ptr);