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 e423e5583e05c1c8b548cfb5c01a61e754034777..f2528a00f72eda67d8ee72a637384899c61b4861 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -63,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"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+       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);
@@ -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);
@@ -239,7 +239,7 @@ ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
 
        for (auto i: film->content()) {
                for (auto j: i->text) {
-                       if (j->use() && j->type() == TEXT_CLOSED_CAPTION && j->dcp_track()) {
+                       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());
                                }