projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change how video timing is done.
[dcpomatic.git]
/
src
/
lib
/
content_video.h
diff --git
a/src/lib/content_video.h
b/src/lib/content_video.h
index 8ca18576e4e939f9c7b469924b6f5e63e89a8d10..1c145f60294f4e7d1e1523cd8cf3abbe16eb12e5 100644
(file)
--- a/
src/lib/content_video.h
+++ b/
src/lib/content_video.h
@@
-18,13
+18,18
@@
*/
*/
+
#ifndef DCPOMATIC_CONTENT_VIDEO_H
#define DCPOMATIC_CONTENT_VIDEO_H
#ifndef DCPOMATIC_CONTENT_VIDEO_H
#define DCPOMATIC_CONTENT_VIDEO_H
+
+#include "dcpomatic_time.h"
#include "types.h"
#include "types.h"
+
class ImageProxy;
class ImageProxy;
+
/** @class ContentVideo
* @brief A frame of video straight out of some content.
*/
/** @class ContentVideo
* @brief A frame of video straight out of some content.
*/
@@
-32,22
+37,22
@@
class ContentVideo
{
public:
ContentVideo ()
{
public:
ContentVideo ()
- : frame (0)
- , eyes (Eyes::LEFT)
+ : eyes (Eyes::LEFT)
, part (Part::WHOLE)
{}
, part (Part::WHOLE)
{}
- ContentVideo (std::shared_ptr<const ImageProxy> i,
Frame f
, Eyes e, Part p)
+ ContentVideo (std::shared_ptr<const ImageProxy> i,
dcpomatic::ContentTime t
, Eyes e, Part p)
: image (i)
: image (i)
- ,
frame (f
)
+ ,
time (t
)
, eyes (e)
, part (p)
{}
std::shared_ptr<const ImageProxy> image;
, eyes (e)
, part (p)
{}
std::shared_ptr<const ImageProxy> image;
-
Frame fra
me;
+
dcpomatic::ContentTime ti
me;
Eyes eyes;
Part part;
};
Eyes eyes;
Part part;
};
+
#endif
#endif