diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-09 22:03:13 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-09 22:03:13 +0000 |
| commit | 3a9bea8c3727af6ebbce860b8223371cd7f87b3f (patch) | |
| tree | 4c2afdd6badac88017ed42c3cd971821e2f3a201 /src/lib/video_content.h | |
| parent | 3190fb98298ebdd29c41b2cf6019a381e71a6248 (diff) | |
Fix display of no-scale mode in the player; the image still has to be scaled for the film viewer as its image must represent a (scaled down) version of the film's frame.
Diffstat (limited to 'src/lib/video_content.h')
| -rw-r--r-- | src/lib/video_content.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/video_content.h b/src/lib/video_content.h index c98a52d3a..ea4676cec 100644 --- 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>); - libdcp::Size size (boost::shared_ptr<const VideoContent>, libdcp::Size) const; + libdcp::Size size (boost::shared_ptr<const VideoContent>, libdcp::Size, libdcp::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; |
