projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another macOS std::list boost::thread SNAFU.
[dcpomatic.git]
/
src
/
lib
/
frame_rate_change.h
diff --git
a/src/lib/frame_rate_change.h
b/src/lib/frame_rate_change.h
index ae3615328d7ce3e5dfccddc596611ad8c40cdeb1..acb75c0b5764e91257ef21d86ff6474b99134ee0 100644
(file)
--- a/
src/lib/frame_rate_change.h
+++ b/
src/lib/frame_rate_change.h
@@
-21,11
+21,19
@@
#ifndef DCPOMATIC_FRAME_RATE_CHANGE_H
#define DCPOMATIC_FRAME_RATE_CHANGE_H
#ifndef DCPOMATIC_FRAME_RATE_CHANGE_H
#define DCPOMATIC_FRAME_RATE_CHANGE_H
+#include <boost/shared_ptr.hpp>
#include <string>
#include <string>
-struct FrameRateChange
+class Film;
+class Content;
+
+class FrameRateChange
{
{
+public:
+ FrameRateChange ();
FrameRateChange (double, int);
FrameRateChange (double, int);
+ FrameRateChange (boost::shared_ptr<const Film> film, boost::shared_ptr<const Content> content);
+ FrameRateChange (boost::shared_ptr<const Film> film, Content const * content);
/** @return factor by which to multiply a source frame rate
to get the effective rate after any skip or repeat has happened.
/** @return factor by which to multiply a source frame rate
to get the effective rate after any skip or repeat has happened.
@@
-62,6
+70,9
@@
struct FrameRateChange
double speed_up;
std::string description () const;
double speed_up;
std::string description () const;
+
+private:
+ void construct (double source_, int dcp_);
};
#endif
};
#endif