BOOST_FOREACH.

[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 666547d16b5f00dad69aa65180566e67eb96d98d..4f34f0531343dce91e946f90cda89b17c2c0d5bb 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -25,16 +25,19 @@
 #include "lib/butler.h"
 #include "lib/text_content.h"
 #include "lib/compose.hpp"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using std::list;
 using std::max;
 using std::cout;
 using std::pair;
 using std::make_pair;
-using boost::shared_ptr;
-using boost::weak_ptr;
+using std::shared_ptr;
+using std::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
@@ -55,7 +58,7 @@ ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer
        , _current_in_lines (false)
        , _timer (this)
 {
-       _lines.resize (CLOSED_CAPTION_LINES);
+       _lines.resize (MAX_CLOSED_CAPTION_LINES);
 
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
@@ -101,16 +104,16 @@ ClosedCaptionsDialog::paint ()
        dc.SetTextForeground (*wxWHITE);
 
        /* Choose a font which fits vertically */
-       int const line_height = max (8, dc.GetSize().GetHeight() / CLOSED_CAPTION_LINES);
+       int const line_height = max (8, dc.GetSize().GetHeight() / MAX_CLOSED_CAPTION_LINES);
        wxFont font (*wxNORMAL_FONT);
        font.SetPixelSize (wxSize (0, line_height * 0.8));
        dc.SetFont (font);
 
-       for (int i = 0; i < CLOSED_CAPTION_LINES; ++i) {
-               wxString const good = _lines[i].Left (CLOSED_CAPTION_LENGTH);
+       for (int i = 0; i < MAX_CLOSED_CAPTION_LINES; ++i) {
+               wxString const good = _lines[i].Left (MAX_CLOSED_CAPTION_LENGTH);
                dc.DrawText (good, 8, line_height * i);
-               if (_lines[i].Length() > CLOSED_CAPTION_LENGTH) {
-                       wxString const bad = _lines[i].Right (_lines[i].Length() - CLOSED_CAPTION_LENGTH);
+               if (_lines[i].Length() > MAX_CLOSED_CAPTION_LENGTH) {
+                       wxString const bad = _lines[i].Right (_lines[i].Length() - MAX_CLOSED_CAPTION_LENGTH);
                        wxSize size = dc.GetTextExtent (good);
                        dc.SetTextForeground (*wxRED);
                        dc.DrawText (bad, 8 + size.GetWidth(), line_height * i);
@@ -155,7 +158,7 @@ ClosedCaptionsDialog::update ()
 
        if (_current && _current->period.to < time) {
                /* Current one has finished; clear out */
-               for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) {
+               for (int j = 0; j < MAX_CLOSED_CAPTION_LINES; ++j) {
                        _lines[j] = "";
                }
                Refresh ();
@@ -189,7 +192,7 @@ ClosedCaptionsDialog::update ()
 
                list<StringText> to_show = _current->text.string;
 
-               for (int j = 0; j < CLOSED_CAPTION_LINES; ++j) {
+               for (int j = 0; j < MAX_CLOSED_CAPTION_LINES; ++j) {
                        _lines[j] = "";
                }
 
@@ -197,7 +200,7 @@ ClosedCaptionsDialog::update ()
 
                list<StringText>::const_iterator j = to_show.begin();
                int k = 0;
-               while (j != to_show.end() && k < CLOSED_CAPTION_LINES) {
+               while (j != to_show.end() && k < MAX_CLOSED_CAPTION_LINES) {
                        _lines[k] = j->text();
                        ++j;
                        ++k;
@@ -208,7 +211,7 @@ ClosedCaptionsDialog::update ()
        }
 
        if (!_current && _tracks.empty()) {
-               for (int i = 0; i < CLOSED_CAPTION_LINES; ++i) {
+               for (int i = 0; i < MAX_CLOSED_CAPTION_LINES; ++i) {
                        _lines[i] = wxString();
                }
        }
@@ -234,8 +237,8 @@ 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) {
+       for (auto i: film->content()) {
+               for (auto j: i->text) {
                        if (j->use() && j->type() == TEXT_CLOSED_CAPTION && j->dcp_track()) {
                                if (find(_tracks.begin(), _tracks.end(), j->dcp_track()) == _tracks.end()) {
                                        _tracks.push_back (*j->dcp_track());
@@ -245,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)));
        }