projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Back port active_frame_rate_change stuff from v2, removing specification of video...
[dcpomatic.git]
/
src
/
lib
/
playlist.h
diff --git
a/src/lib/playlist.h
b/src/lib/playlist.h
index 394023f5c5c90e4315b1fc9d4f37d8ef394a1f5e..effc521012dfbc70779f5bfd9f4befe2a79d4616 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 "frame_rate_change.h"
class Content;
class FFmpegContent;
class Content;
class FFmpegContent;
@@
-74,6
+75,7
@@
public:
int best_dcp_frame_rate () const;
Time video_end () const;
int best_dcp_frame_rate () const;
Time video_end () const;
+ FrameRateChange active_frame_rate_change (Time, int dcp_frame_rate) const;
void set_sequence_video (bool);
void maybe_sequence_video ();
void set_sequence_video (bool);
void maybe_sequence_video ();