diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-04-01 22:49:31 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-04-01 22:49:31 +0100 |
| commit | db468a15e50c8491d4b8462ad0676be905f49065 (patch) | |
| tree | 4b6d93f0916264f9cf67d11440e5fe491ab58a3a /src/lib/format.cc | |
| parent | 623845efac0831aa1e2df6b79c4e879a7b901c69 (diff) | |
Various bits.
Diffstat (limited to 'src/lib/format.cc')
| -rw-r--r-- | src/lib/format.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/format.cc b/src/lib/format.cc index 05b71f2e5..538bf7953 100644 --- a/src/lib/format.cc +++ b/src/lib/format.cc @@ -207,9 +207,9 @@ FixedFormat::FixedFormat (int r, libdcp::Size dcp, string id, string n, string d * (so there are dcp_padding() pixels on the left and dcp_padding() on the right) */ int -Format::dcp_padding (shared_ptr<const Playlist> p) const +Format::dcp_padding (shared_ptr<const Film> f) const { - int pad = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_integer(p) / 100.0)) / 2.0); + int pad = rint ((_dcp_size.width - (_dcp_size.height * ratio_as_integer(f) / 100.0)) / 2.0); /* This comes out -ve for Scope; bodge it */ if (pad < 0) { @@ -232,15 +232,15 @@ VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d, } int -VariableFormat::ratio_as_integer (shared_ptr<const Playlist> p) const +VariableFormat::ratio_as_integer (shared_ptr<const Film> f) const { - return rint (ratio_as_float (p) * 100); + return rint (ratio_as_float (f) * 100); } float -VariableFormat::ratio_as_float (shared_ptr<const Playlist> p) const +VariableFormat::ratio_as_float (shared_ptr<const Film> f) const { - return float (p->video_size().width) / p->video_size().height; + return float (f->video_size().width) / f->video_size().height; } /** @return A name to be presented to the user */ |