projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
lib
/
content_video.h
diff --git
a/src/lib/content_video.h
b/src/lib/content_video.h
index a7f73597c866495b0df60a2f3036bd8066d0f1f0..2c996f816650de6651463c3b33887d765b880aa9 100644
(file)
--- a/
src/lib/content_video.h
+++ b/
src/lib/content_video.h
@@
-30,19
+30,21
@@
class ContentVideo
public:
ContentVideo ()
: eyes (EYES_BOTH)
public:
ContentVideo ()
: eyes (EYES_BOTH)
+ , part (PART_WHOLE)
+ , frame (0)
{}
{}
- ContentVideo (boost::shared_ptr<const ImageProxy> i, Eyes e, Part p,
Video
Frame f)
+ ContentVideo (boost::shared_ptr<const ImageProxy> i, Eyes e, Part p, Frame f)
: image (i)
, eyes (e)
, part (p)
, frame (f)
{}
: image (i)
, eyes (e)
, part (p)
, frame (f)
{}
-
+
boost::shared_ptr<const ImageProxy> image;
Eyes eyes;
Part part;
boost::shared_ptr<const ImageProxy> image;
Eyes eyes;
Part part;
-
Video
Frame frame;
+ Frame frame;
};
#endif
};
#endif