More enum class additions.

[dcpomatic.git] / src / wx / closed_captions_dialog.cc

diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc
index 71fc1527257a92f6e6312b45f592b18acde12c9a..f2528a00f72eda67d8ee72a637384899c61b4861 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -134,11 +134,11 @@ private:
        float from_top (StringText const & c) const
        {
                switch (c.v_align()) {
-               case dcp::VALIGN_TOP:
+               case dcp::VAlign::TOP:
                        return c.v_position();
-               case dcp::VALIGN_CENTER:
+               case dcp::VAlign::CENTER:
                        return c.v_position() + 0.5;
-               case dcp::VALIGN_BOTTOM:
+               case dcp::VAlign::BOTTOM:
                        return 1.0 - c.v_position();
                }
                DCPOMATIC_ASSERT (false);
@@ -237,9 +237,9 @@ ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
 {
        _tracks.clear ();
 
-       BOOST_FOREACH (shared_ptr<Content> i, film->content()) {
-               BOOST_FOREACH (shared_ptr<TextContent> j, i->text) {
-                       if (j->use() && j->type() == TEXT_CLOSED_CAPTION && j->dcp_track()) {
+       for (auto i: film->content()) {
+               for (auto j: i->text) {
+                       if (j->use() && j->type() == TextType::CLOSED_CAPTION && j->dcp_track()) {
                                if (find(_tracks.begin(), _tracks.end(), j->dcp_track()) == _tracks.end()) {
                                        _tracks.push_back (*j->dcp_track());
                                }
@@ -248,7 +248,7 @@ ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
        }
 
        _track->Clear ();
-       BOOST_FOREACH (DCPTextTrack const & i, _tracks) {
+       for (auto const& i: _tracks) {
                _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language)));
        }