projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
playlist.h
diff --git
a/src/lib/playlist.h
b/src/lib/playlist.h
index effc521012dfbc70779f5bfd9f4befe2a79d4616..7c29b85887c82e55791fdc85209125adc198ac53 100644
(file)
--- a/
src/lib/playlist.h
+++ b/
src/lib/playlist.h
@@
-25,6
+25,7
@@
#include <boost/enable_shared_from_this.hpp>
#include "ffmpeg_content.h"
#include "audio_mapping.h"
#include <boost/enable_shared_from_this.hpp>
#include "ffmpeg_content.h"
#include "audio_mapping.h"
+#include "util.h"
#include "frame_rate_change.h"
class Content;
#include "frame_rate_change.h"
class Content;
@@
-38,18
+39,15
@@
class Job;
class Film;
class Region;
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<Content> a, boost::shared_ptr<Content> b);
};
struct ContentSorter
{
bool operator() (boost::shared_ptr<Content> a, boost::shared_ptr<Content> 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:
class Playlist : public boost::noncopyable
{
public:
@@
-57,7
+55,7
@@
public:
~Playlist ();
void as_xml (xmlpp::Node *);
~Playlist ();
void as_xml (xmlpp::Node *);
- void set_from_xml (boost::shared_ptr<const Film>,
boost::shared_ptr<const cxml::Node>
, int, std::list<std::string> &);
+ void set_from_xml (boost::shared_ptr<const Film>,
cxml::ConstNodePtr
, int, std::list<std::string> &);
void add (boost::shared_ptr<Content>);
void remove (boost::shared_ptr<Content>);
void add (boost::shared_ptr<Content>);
void remove (boost::shared_ptr<Content>);
@@
-71,11
+69,11
@@
public:
std::string video_identifier () const;
std::string video_identifier () const;
- Time length () const;
+
DCP
Time length () const;
int best_dcp_frame_rate () const;
int best_dcp_frame_rate () const;
- Time video_end () const;
- FrameRateChange active_frame_rate_change (Time, int dcp_frame_rate) const;
+
DCP
Time video_end () const;
+ FrameRateChange active_frame_rate_change (
DCP
Time, int dcp_frame_rate) const;
void set_sequence_video (bool);
void maybe_sequence_video ();
void set_sequence_video (bool);
void maybe_sequence_video ();