diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-01-21 02:44:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-01-21 20:15:14 +0100 |
| commit | 28111007e2e6fd62f5810be780706ae1618bd33f (patch) | |
| tree | d99fe830ba961b174d3f024d2b5671a9821ed8a9 /src/lib/writer.cc | |
| parent | c7d77490382d6ddb625340c05b57487cde244f96 (diff) | |
Adapt for libdcp use of enum class.
Diffstat (limited to 'src/lib/writer.cc')
| -rw-r--r-- | src/lib/writer.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 8c5a82415..a67430d61 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -623,15 +623,15 @@ Writer::finish (boost::filesystem::path output_dcp) cpl->set_facility (film()->facility()); cpl->set_luminance (film()->luminance()); - list<int> ac = film()->mapped_audio_channels(); + auto ac = film()->mapped_audio_channels(); dcp::MCASoundField field = ( - find(ac.begin(), ac.end(), static_cast<int>(dcp::BSL)) != ac.end() || - find(ac.begin(), ac.end(), static_cast<int>(dcp::BSR)) != ac.end() - ) ? dcp::SEVEN_POINT_ONE : dcp::FIVE_POINT_ONE; + find(ac.begin(), ac.end(), static_cast<int>(dcp::Channel::BSL)) != ac.end() || + find(ac.begin(), ac.end(), static_cast<int>(dcp::Channel::BSR)) != ac.end() + ) ? dcp::MCASoundField::SEVEN_POINT_ONE : dcp::MCASoundField::FIVE_POINT_ONE; dcp::MainSoundConfiguration msc (field, film()->audio_channels()); for (auto i: ac) { - if (i < film()->audio_channels()) { + if (static_cast<int>(i) < film()->audio_channels()) { msc.set_mapping (i, static_cast<dcp::Channel>(i)); } } @@ -655,7 +655,7 @@ Writer::finish (boost::filesystem::path output_dcp) } dcp.write_xml ( - film()->interop() ? dcp::INTEROP : dcp::SMPTE, + film()->interop() ? dcp::Standard::INTEROP : dcp::Standard::SMPTE, issuer, creator, dcp::LocalTime().as_string(), |