diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-01-14 10:39:12 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-01-14 23:51:12 +0100 |
| commit | faa7efd869e11c6e0ec4f00da8e1ad99415c709b (patch) | |
| tree | 73868bd28712442a73c6478be89931a941ebcdbc /src/lib | |
| parent | 2a3a5622275f8dc669d589625718c8a2a14e75f1 (diff) | |
Put film_util methods in a namespace.
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/film_util.cc | 4 | ||||
| -rw-r--r-- | src/lib/film_util.h | 11 | ||||
| -rw-r--r-- | src/lib/reel_writer.cc | 2 | ||||
| -rw-r--r-- | src/lib/writer.cc | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/src/lib/film_util.cc b/src/lib/film_util.cc index a12a3ae89..e5bc30db4 100644 --- a/src/lib/film_util.cc +++ b/src/lib/film_util.cc @@ -29,7 +29,7 @@ using boost::optional; bool -channel_is_mapped(shared_ptr<const Film> film, dcp::Channel channel) +dcpomatic::film::channel_is_mapped(shared_ptr<const Film> film, dcp::Channel channel) { auto const mapped = film->mapped_audio_channels(); return std::find(mapped.begin(), mapped.end(), static_cast<int>(channel)) != mapped.end(); @@ -37,7 +37,7 @@ channel_is_mapped(shared_ptr<const Film> film, dcp::Channel channel) optional<boost::filesystem::path> -add_files_override_path(shared_ptr<const Film> film) +dcpomatic::film::add_files_override_path(shared_ptr<const Film> film) { film->directory(); return Config::instance()->default_add_file_location() == Config::DefaultAddFileLocation::SAME_AS_PROJECT diff --git a/src/lib/film_util.h b/src/lib/film_util.h index 3e5f40644..958c2c3cc 100644 --- a/src/lib/film_util.h +++ b/src/lib/film_util.h @@ -25,5 +25,16 @@ class Film; +namespace dcpomatic +{ +namespace film +{ + + bool channel_is_mapped(std::shared_ptr<const Film> film, dcp::Channel channel); boost::optional<boost::filesystem::path> add_files_override_path(std::shared_ptr<const Film> film); + + +} +} + diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc index 3cd889249..7bcc2d796 100644 --- a/src/lib/reel_writer.cc +++ b/src/lib/reel_writer.cc @@ -226,7 +226,7 @@ ReelWriter::ReelWriter ( std::vector<dcp::Channel> extra_active_channels; for (auto channel: std::vector<dcp::Channel>{dcp::Channel::HI, dcp::Channel::VI, dcp::Channel::BSL, dcp::Channel::BSR}) { - if (channel_is_mapped(film(), channel)) { + if (dcpomatic::film::channel_is_mapped(film(), channel)) { extra_active_channels.push_back(channel); } } diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 9b7f059f9..3f5be531e 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -671,7 +671,7 @@ Writer::finish() } dcp::MCASoundField field; - if (channel_is_mapped(film(), dcp::Channel::BSL) || channel_is_mapped(film(), dcp::Channel::BSR)) { + if (dcpomatic::film::channel_is_mapped(film(), dcp::Channel::BSL) || dcpomatic::film::channel_is_mapped(film(), dcp::Channel::BSR)) { field = dcp::MCASoundField::SEVEN_POINT_ONE; } else { field = dcp::MCASoundField::FIVE_POINT_ONE; |