Merge master.

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

diff --git a/src/lib/format.h b/src/lib/format.h
index 48a000480fcbacec36189b062431780817f6c419..7958ca5341604e199a181b2295e0708b3614d542 100644 (file)
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -46,7 +46,10 @@ public:
        /** @return the ratio as a floating point number */
        virtual float ratio_as_float (boost::shared_ptr<const Film> f) const = 0;
 
-       int dcp_padding (boost::shared_ptr<const Film> f) const;
+       /** @return the ratio of the container (including any padding) as a floating point number */
+       float container_ratio_as_float () const;
+
+       int dcp_padding (boost::shared_ptr<const Film>) const;
 
        /** @return size in pixels of the images that we should
         *  put in a DCP for this ratio.  This size will not correspond
@@ -81,7 +84,7 @@ public:
        static void setup_formats ();
 
 protected:     
-       /** Size in pixels of the images that we should
+       /** libdcp::Size in pixels of the images that we should
         *  put in a DCP for this ratio.  This size will not correspond
         *  to the ratio when we are doing things like 16:9 in a Flat frame.
         */