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.h | |
| parent | 623845efac0831aa1e2df6b79c4e879a7b901c69 (diff) | |
Various bits.
Diffstat (limited to 'src/lib/format.h')
| -rw-r--r-- | src/lib/format.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/format.h b/src/lib/format.h index 94c2253de..cc7502893 100644 --- a/src/lib/format.h +++ b/src/lib/format.h @@ -26,7 +26,7 @@ #include <vector> #include "util.h" -class Playlist; +class Film; class Format { @@ -42,15 +42,15 @@ public: /** @return the aspect ratio multiplied by 100 * (e.g. 239 for Cinemascope 2.39:1) */ - virtual int ratio_as_integer (boost::shared_ptr<const Playlist> f) const = 0; + virtual int ratio_as_integer (boost::shared_ptr<const Film> f) const = 0; /** @return the ratio as a floating point number */ - virtual float ratio_as_float (boost::shared_ptr<const Playlist> f) const = 0; + virtual float ratio_as_float (boost::shared_ptr<const Film> f) const = 0; /** @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 Playlist>) 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 @@ -115,11 +115,11 @@ class FixedFormat : public Format public: FixedFormat (int, libdcp::Size, std::string, std::string, std::string, std::string); - int ratio_as_integer (boost::shared_ptr<const Playlist>) const { + int ratio_as_integer (boost::shared_ptr<const Film>) const { return _ratio; } - float ratio_as_float (boost::shared_ptr<const Playlist>) const { + float ratio_as_float (boost::shared_ptr<const Film>) const { return _ratio / 100.0; } @@ -136,8 +136,8 @@ class VariableFormat : public Format public: VariableFormat (libdcp::Size, std::string, std::string, std::string, std::string); - int ratio_as_integer (boost::shared_ptr<const Playlist> f) const; - float ratio_as_float (boost::shared_ptr<const Playlist> f) const; + int ratio_as_integer (boost::shared_ptr<const Film> f) const; + float ratio_as_float (boost::shared_ptr<const Film> f) const; std::string name () const; }; |