Extract constants.h

[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..903d47c7526ce98c36415fa90d74f36e67b68939 100644 (file)
--- a/src/wx/closed_captions_dialog.cc
+++ b/src/wx/closed_captions_dialog.cc
@@ -18,20 +18,23 @@
 
 */
 
+
 #include "closed_captions_dialog.h"
-#include "wx_util.h"
 #include "film_viewer.h"
-#include "lib/string_text.h"
+#include "wx_util.h"
 #include "lib/butler.h"
-#include "lib/text_content.h"
 #include "lib/compose.hpp"
+#include "lib/constants.h"
+#include "lib/string_text.h"
+#include "lib/text_content.h"
 #include <boost/bind/bind.hpp>
 
+
+using std::cout;
 using std::list;
+using std::make_pair;
 using std::max;
-using std::cout;
 using std::pair;
-using std::make_pair;
 using std::shared_ptr;
 using std::weak_ptr;
 using boost::optional;
@@ -40,6 +43,7 @@ using namespace boost::placeholders;
 #endif
 using namespace dcpomatic;
 
+
 ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
        : wxDialog (parent, wxID_ANY, _("Closed captions"), wxDefaultPosition, wxDefaultSize,
 #ifdef DCPOMATIC_OSX
@@ -63,7 +67,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 +138,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);
@@ -149,7 +153,7 @@ private:
 void
 ClosedCaptionsDialog::update ()
 {
-       DCPTime const time = _viewer->time ();
+       auto const time = _viewer->time ();
 
        if (_current_in_lines && _current && _current->period.to > time) {
                /* Current one is fine */
@@ -167,10 +171,10 @@ ClosedCaptionsDialog::update ()
 
        if (!_current && !_tracks.empty()) {
                /* We have no current one: get another */
-               shared_ptr<Butler> butler = _butler.lock ();
+               auto butler = _butler.lock ();
                DCPOMATIC_ASSERT (_track->GetSelection() >= 0);
                DCPOMATIC_ASSERT (_track->GetSelection() < int(_tracks.size()));
-               DCPTextTrack track = _tracks[_track->GetSelection()];
+               auto track = _tracks[_track->GetSelection()];
                if (butler) {
                        while (true) {
                                optional<TextRingBuffers::Data> d = butler->get_closed_caption ();
@@ -190,7 +194,7 @@ ClosedCaptionsDialog::update ()
        if (_current && _current->period.contains(time)) {
                /* We need to set this new one up */
 
-               list<StringText> to_show = _current->text.string;
+               auto to_show = _current->text.string;
 
                for (int j = 0; j < MAX_CLOSED_CAPTION_LINES; ++j) {
                        _lines[j] = "";
@@ -198,10 +202,10 @@ ClosedCaptionsDialog::update ()
 
                to_show.sort (ClosedCaptionSorter());
 
-               list<StringText>::const_iterator j = to_show.begin();
+               auto j = to_show.begin();
                int k = 0;
                while (j != to_show.end() && k < MAX_CLOSED_CAPTION_LINES) {
-                       _lines[k] = j->text();
+                       _lines[k] = std_to_wx (j->text());
                        ++j;
                        ++k;
                }
@@ -239,7 +243,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());
                                }
@@ -249,7 +253,7 @@ ClosedCaptionsDialog::update_tracks (shared_ptr<const Film> film)
 
        _track->Clear ();
        for (auto const& i: _tracks) {
-               _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language)));
+               _track->Append (std_to_wx(String::compose("%1 (%2)", i.name, i.language ? i.language->to_string() : wx_to_std(_("Unknown")))));
        }
 
        if (_track->GetCount() > 0) {