Merge master.

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

diff --git a/src/lib/format.cc b/src/lib/format.cc
index faadcd79779edf22b266093c0ce3a4d5015d2f7f..cce8762bdadd51766ef0cf01cd237c30f8892861 100644 (file)
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -29,6 +29,7 @@
 #include <iostream>
 #include "format.h"
 #include "film.h"
+#include "playlist.h"
 
 #include "i18n.h"
 
@@ -199,7 +200,7 @@ FixedFormat::FixedFormat (int r, libdcp::Size dcp, string id, string n, string d
 int
 Format::dcp_padding (shared_ptr<const Film> f) const
 {
-       int p = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_float(f))) / 2.0);
+       int p = rint ((_dcp_size.width - (_dcp_size.height * ratio(f))) / 2.0);
 
        /* This comes out -ve for Scope; bodge it */
        if (p < 0) {
@@ -230,7 +231,7 @@ VariableFormat::ratio_as_integer (shared_ptr<const Film> f) const
 float
 VariableFormat::ratio_as_float (shared_ptr<const Film> f) const
 {
-       libdcp::Size const c = f->cropped_size (f->size ());
+       libdcp::Size const c = f->cropped_size (f->video_size ());
        return float (c.width) / c.height;
 }