X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fclosed_captions_dialog.cc;h=903d47c7526ce98c36415fa90d74f36e67b68939;hp=7fcfc0808667a4d0d0271cda359044da98c5a088;hb=da38c8a0156808595be0aae1b1490069a663fb78;hpb=d27598b1dcddd84fc0063dd1b67deabe164dc310 diff --git a/src/wx/closed_captions_dialog.cc b/src/wx/closed_captions_dialog.cc index 7fcfc0808..903d47c75 100644 --- 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 + +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