More enum class additions.

[dcpomatic.git] / src / lib / video_content.h

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index e5bbb5bab066bdcb495700c12aa4faf2cb90151f..22a6090e7a62454cac16ae25fe9be932b4c52df6 100644 (file)
--- 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;