Look up unknown subtitle end times from the data prepared by the examiner.

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

diff --git a/src/lib/video_content_scale.h b/src/lib/video_content_scale.h
index 6b718d5741e09380d47abaff3e42268937178471..74e91e78f6549c0e85672aa74a987f4f27ecd585 100644 (file)
--- a/src/lib/video_content_scale.h
+++ b/src/lib/video_content_scale.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,9 +20,9 @@
 #ifndef DCPOMATIC_VIDEO_CONTENT_SCALE_H
 #define DCPOMATIC_VIDEO_CONTENT_SCALE_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
 #include <dcp/util.h>
+#include <boost/shared_ptr.hpp>
+#include <vector>
 
 namespace cxml {
        class Node;
@@ -43,7 +43,7 @@ public:
        VideoContentScale (bool);
        VideoContentScale (boost::shared_ptr<cxml::Node>);
 
-       dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size, int round) const;
+       dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size display_container, dcp::Size film_container) const;
        std::string id () const;
        std::string name () const;
        void as_xml (xmlpp::Node *) const;
@@ -65,9 +65,13 @@ public:
 private:
        /** a ratio to stretch the content to, or 0 for no stretch */
        Ratio const * _ratio;
-       /** true if we want to scale the content */
+       /** true if we want to change the size of the content in any way */
        bool _scale;
 
+       /* If _ratio is 0 and _scale is false there is no scale at all (i.e.
+          the content is used at its original size)
+       */
+
        static std::vector<VideoContentScale> _scales;
 };