macOS / new boost build fixes.

[dcpomatic.git] / src / lib / writer.cc

diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 0b1d8e06d08d3604ec6848c8ff95e3344c2f577c..d3fdc5128611a2e6c5436ae8c6147be61c07034e 100644 (file)
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -62,6 +62,9 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::Data;
 using namespace dcpomatic;
 
@@ -599,10 +602,10 @@ Writer::finish ()
        cpl->set_luminance (_film->luminance());
 
        list<int> ac = _film->mapped_audio_channels ();
-       dcp::MainSoundConfiguration::Field field = (
+       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::MainSoundConfiguration::SEVEN_POINT_ONE : dcp::MainSoundConfiguration::FIVE_POINT_ONE;
+               ) ? dcp::SEVEN_POINT_ONE : dcp::FIVE_POINT_ONE;
 
        dcp::MainSoundConfiguration msc (field, _film->audio_channels());
        BOOST_FOREACH (int i, ac) {