summaryrefslogtreecommitdiff
path: root/src/wx/closed_captions_dialog.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/wx/closed_captions_dialog.cc')
-rw-r--r--src/wx/closed_captions_dialog.cc14
1 files changed, 9 insertions, 5 deletions
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 <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