summaryrefslogtreecommitdiff
path: root/src/lib/video_content.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-31 03:14:24 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-31 03:14:24 +0100
commit8fedaaa75c4586a4cc7ffb393bd71d1fdb091dc8 (patch)
treef8b25b13ac3732838be259e469d045438d999e7b /src/lib/video_content.h
parent4985d87750c87019dfe5dc7ef44e12c45326dd0e (diff)
More enum class additions.
Diffstat (limited to 'src/lib/video_content.h')
-rw-r--r--src/lib/video_content.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index e5bbb5bab..22a6090e7 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -53,6 +53,7 @@ class VideoContent : public ContentPart, public std::enable_shared_from_this<Vid
{
public:
explicit VideoContent (Content* parent);
+ VideoContent (Content* parent, cxml::ConstNodePtr, int);
VideoContent (Content* parent, std::vector<std::shared_ptr<Content> >);
void as_xml (xmlpp::Node *) const;
@@ -67,7 +68,7 @@ public:
Frame length_after_3d_combine () const {
boost::mutex::scoped_lock lm (_mutex);
- if (_frame_type == VIDEO_FRAME_TYPE_3D_ALTERNATE) {
+ if (_frame_type == VideoFrameType::THREE_D_ALTERNATE) {
return _length / 2;
}
@@ -205,7 +206,6 @@ private:
friend struct scaled_size_test2;
friend struct scaled_size_legacy_test;
- VideoContent (Content* parent, cxml::ConstNodePtr, int);
void setup_default_colour_conversion ();
bool _use;