diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-06-01 01:39:04 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-06-17 00:04:03 +0200 |
| commit | ec06811bae7ed4fc6bd80c3154fd473028ee8e13 (patch) | |
| tree | b398119a1a84d261ee16b57171652fd8714d657a /src/lib/film.h | |
| parent | 21e9bd77598f7bb4588ca9b16a58667e3340f6d9 (diff) | |
Pass Ratio around as an object rather than a pointer.
Diffstat (limited to 'src/lib/film.h')
| -rw-r--r-- | src/lib/film.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/film.h b/src/lib/film.h index c14b0f4fa..1af21849e 100644 --- a/src/lib/film.h +++ b/src/lib/film.h @@ -36,6 +36,7 @@ #include "film_property.h" #include "frame_rate_change.h" #include "named_channel.h" +#include "ratio.h" #include "remembered_asset.h" #include "resolution.h" #include "signaller.h" @@ -75,7 +76,6 @@ class Film; class Job; class Log; class Playlist; -class Ratio; struct atmos_encrypted_passthrough_test; struct isdcf_name_test; struct isdcf_name_with_atmos; @@ -216,7 +216,7 @@ public: return _dcp_content_type; } - Ratio const * container() const { + Ratio const& container() const { return _container; } @@ -384,7 +384,7 @@ public: void move_content_earlier(std::shared_ptr<Content>); void move_content_later(std::shared_ptr<Content>); void set_dcp_content_type(DCPContentType const *); - void set_container(Ratio const *, bool user_explicit = true); + void set_container(Ratio c, bool user_explicit = true); void set_resolution(Resolution, bool user_explicit = true); void set_encrypted(bool); void set_video_bit_rate(VideoEncoding encoding, int64_t); @@ -503,7 +503,7 @@ private: /** The type of content that this Film represents (feature, trailer etc.) */ DCPContentType const * _dcp_content_type; /** The container to put this Film in (flat, scope, etc.) */ - Ratio const * _container; + Ratio _container; /** DCP resolution (2K or 4K) */ Resolution _resolution; bool _encrypted; |