Remove subtitle language from text content.

[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 625652b8c30d2a4dc6dde2326b6ea8b0cfd43134..5522e5c4cfb35df9142fad3b23ab42d7798030c9 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -35,6 +35,9 @@ using std::make_pair;
 using boost::shared_ptr;
 using boost::weak_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using namespace dcpomatic;
 
 ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
@@ -60,7 +63,7 @@ ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer
        wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
        wxBoxSizer* track_sizer = new wxBoxSizer (wxHORIZONTAL);
-       add_label_to_sizer (track_sizer, this, _("Track"), true);
+       add_label_to_sizer (track_sizer, this, _("Track"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
        track_sizer->Add (_track, 0, wxEXPAND | wxLEFT, DCPOMATIC_SIZER_X_GAP);
 
        sizer->Add (track_sizer, 0, wxALL, DCPOMATIC_SIZER_GAP);
@@ -165,22 +168,23 @@ ClosedCaptionsDialog::update ()
        if (!_current && !_tracks.empty()) {
                /* We have no current one: get another */
                shared_ptr<Butler> butler = _butler.lock ();
-               DCPOMATIC_ASSERT (butler);
                DCPOMATIC_ASSERT (_track->GetSelection() >= 0);
                DCPOMATIC_ASSERT (_track->GetSelection() < int(_tracks.size()));
                DCPTextTrack track = _tracks[_track->GetSelection()];
-               while (true) {
-                       optional<TextRingBuffers::Data> d = butler->get_closed_caption ();
-                       if (!d) {
-                               break;
-                       }
-                       if (d->track == track) {
-                               _current = d;
-                               break;
+               if (butler) {
+                       while (true) {
+                               optional<TextRingBuffers::Data> d = butler->get_closed_caption ();
+                               if (!d) {
+                                       break;
+                               }
+                               if (d->track == track) {
+                                       _current = d;
+                                       break;
+                               }
                        }
-               }
 
-               _current_in_lines = false;
+                       _current_in_lines = false;
+               }
        }
 
        if (_current && _current->period.contains(time)) {