projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
content_video.h
diff --git
a/src/lib/content_video.h
b/src/lib/content_video.h
index 21a600709e9076e802c944c366a6fe9bbb68f54b..8ca18576e4e939f9c7b469924b6f5e63e89a8d10 100644
(file)
--- a/
src/lib/content_video.h
+++ b/
src/lib/content_video.h
@@
-21,6
+21,8
@@
#ifndef DCPOMATIC_CONTENT_VIDEO_H
#define DCPOMATIC_CONTENT_VIDEO_H
#ifndef DCPOMATIC_CONTENT_VIDEO_H
#define DCPOMATIC_CONTENT_VIDEO_H
+#include "types.h"
+
class ImageProxy;
/** @class ContentVideo
class ImageProxy;
/** @class ContentVideo
@@
-30,22
+32,22
@@
class ContentVideo
{
public:
ContentVideo ()
{
public:
ContentVideo ()
- :
eyes (EYES_BOTH
)
- ,
part (PART_WHOLE
)
- ,
frame (0
)
+ :
frame (0
)
+ ,
eyes (Eyes::LEFT
)
+ ,
part (Part::WHOLE
)
{}
{}
- ContentVideo (
boost::shared_ptr<const ImageProxy> i, Eyes e, Part p, Frame f
)
+ ContentVideo (
std::shared_ptr<const ImageProxy> i, Frame f, Eyes e, Part p
)
: image (i)
: image (i)
+ , frame (f)
, eyes (e)
, part (p)
, eyes (e)
, part (p)
- , frame (f)
{}
{}
- boost::shared_ptr<const ImageProxy> image;
+ std::shared_ptr<const ImageProxy> image;
+ Frame frame;
Eyes eyes;
Part part;
Eyes eyes;
Part part;
- Frame frame;
};
#endif
};
#endif