Adapt for libdcp use of enum class.

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

diff --git a/src/lib/ffmpeg_encoder.cc b/src/lib/ffmpeg_encoder.cc
index 4e1f0bcb59ca5f57115d8de3bdf80ae8996d06b3..9504b51b867651369480f81273de7d0a9a6b1930 100644 (file)
--- a/src/lib/ffmpeg_encoder.cc
+++ b/src/lib/ffmpeg_encoder.cc
@@ -78,21 +78,21 @@ FFmpegEncoder::FFmpegEncoder (
                float const overall_gain = 2 / (4 + sqrt(2));
                float const minus_3dB = 1 / sqrt(2);
                if (ch == 2) {
-                       map.set (dcp::LEFT, 0, 1);
-                       map.set (dcp::RIGHT, 1, 1);
+                       map.set (dcp::Channel::LEFT, 0, 1);
+                       map.set (dcp::Channel::RIGHT, 1, 1);
                } else if (ch == 4) {
-                       map.set (dcp::LEFT,   0, overall_gain);
-                       map.set (dcp::RIGHT,  1, overall_gain);
-                       map.set (dcp::CENTRE, 0, overall_gain * minus_3dB);
-                       map.set (dcp::CENTRE, 1, overall_gain * minus_3dB);
-                       map.set (dcp::LS,     0, overall_gain);
+                       map.set (dcp::Channel::LEFT,   0, overall_gain);
+                       map.set (dcp::Channel::RIGHT,  1, overall_gain);
+                       map.set (dcp::Channel::CENTRE, 0, overall_gain * minus_3dB);
+                       map.set (dcp::Channel::CENTRE, 1, overall_gain * minus_3dB);
+                       map.set (dcp::Channel::LS,     0, overall_gain);
                } else if (ch >= 6) {
-                       map.set (dcp::LEFT,   0, overall_gain);
-                       map.set (dcp::RIGHT,  1, overall_gain);
-                       map.set (dcp::CENTRE, 0, overall_gain * minus_3dB);
-                       map.set (dcp::CENTRE, 1, overall_gain * minus_3dB);
-                       map.set (dcp::LS,     0, overall_gain);
-                       map.set (dcp::RS,     1, overall_gain);
+                       map.set (dcp::Channel::LEFT,   0, overall_gain);
+                       map.set (dcp::Channel::RIGHT,  1, overall_gain);
+                       map.set (dcp::Channel::CENTRE, 0, overall_gain * minus_3dB);
+                       map.set (dcp::Channel::CENTRE, 1, overall_gain * minus_3dB);
+                       map.set (dcp::Channel::LS,     0, overall_gain);
+                       map.set (dcp::Channel::RS,     1, overall_gain);
                }
                /* XXX: maybe we should do something better for >6 channel DCPs */
        } else {
@@ -212,7 +212,7 @@ FFmpegEncoder::go ()
        }
        delete[] interleaved;
 
-       BOOST_FOREACH (FileEncoderSet i, file_encoders) {
+       for (auto i: file_encoders) {
                i.flush ();
        }
 }