projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mostly-merge master.
[dcpomatic.git]
/
src
/
lib
/
playlist.h
diff --git
a/src/lib/playlist.h
b/src/lib/playlist.h
index 7dbf416041d8bf4bfa555bf45341ee01e04af812..444eb9ae5ebb5ae1aac34932440025c92c3f8b43 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"
class Content;
class FFmpegContent;
class Content;
class FFmpegContent;
@@
-56,11
+57,13
@@
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>);
+ void set_from_xml (boost::shared_ptr<const Film>, boost::shared_ptr<const cxml::Node>
, int, std::list<std::string> &
);
void add (boost::shared_ptr<Content>);
void remove (boost::shared_ptr<Content>);
void remove (ContentList);
void add (boost::shared_ptr<Content>);
void remove (boost::shared_ptr<Content>);
void remove (ContentList);
+ void move_earlier (boost::shared_ptr<Content>);
+ void move_later (boost::shared_ptr<Content>);
bool has_subtitles () const;
bool has_subtitles () const;
@@
-68,10
+71,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;
+ DCPTime video_end () const;
+ FrameRateChange active_frame_rate_change (DCPTime, int dcp_frame_rate) const;
void set_sequence_video (bool);
void maybe_sequence_video ();
void set_sequence_video (bool);
void maybe_sequence_video ();
@@
-86,6
+90,7
@@
private:
void content_changed (boost::weak_ptr<Content>, int, bool);
void reconnect ();
void content_changed (boost::weak_ptr<Content>, int, bool);
void reconnect ();
+ /** List of content. Kept sorted in position order. */
ContentList _content;
bool _sequence_video;
bool _sequencing_video;
ContentList _content;
bool _sequence_video;
bool _sequencing_video;