Merge master.

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

diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index a82c6c22131a339229c55d078942677d57718465..d2b19480f056f1895ab722d1ee50a96ee1989d37 100644 (file)
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -45,7 +45,7 @@ public:
        VideoContentScale (bool);
        VideoContentScale (boost::shared_ptr<cxml::Node>);
 
-       dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size) const;
+       dcp::Size size (boost::shared_ptr<const VideoContent>, dcp::Size, dcp::Size) const;
        std::string id () const;
        std::string name () const;
        void as_xml (xmlpp::Node *) const;
@@ -64,7 +64,9 @@ 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 */
        bool _scale;
 
        static std::vector<VideoContentScale> _scales;