C++11 tidying.

[dcpomatic.git] / src / wx / export_video_file_dialog.cc

diff --git a/src/wx/export_video_file_dialog.cc b/src/wx/export_video_file_dialog.cc
index 062fcc81f4732400104c63a845cc52499211393a..54bdbdf03cf77e897f3d253605d61e1c7a6b3031 100644 (file)
--- a/src/wx/export_video_file_dialog.cc
+++ b/src/wx/export_video_file_dialog.cc
@@ -18,23 +18,27 @@
 
 */
 
+
 #include "check_box.h"
 #include "export_video_file_dialog.h"
 #include "file_picker_ctrl.h"
 #include "wx_util.h"
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/filepicker.h>
-DCPOMATIC_ENABLE_WARNINGS
-#include <boost/bind.hpp>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/bind/bind.hpp>
+
 
 using std::string;
 using boost::bind;
 
+
 #define FORMATS 2
 
+
 wxString format_names[] = {
-       _("ProRes"),
+       _("MOV / ProRes"),
        _("MP4 / H.264"),
 };
 
@@ -49,8 +53,8 @@ wxString format_extensions[] = {
 };
 
 ExportFormat formats[] = {
-       EXPORT_FORMAT_PRORES,
-       EXPORT_FORMAT_H264_AAC,
+       ExportFormat::PRORES,
+       ExportFormat::H264_AAC,
 };
 
 ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)
@@ -104,7 +108,7 @@ ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)
 
        layout ();
 
-       wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
+       auto ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
        ok->Enable (false);
 }
 
@@ -163,7 +167,7 @@ ExportVideoFileDialog::x264_crf () const
 void
 ExportVideoFileDialog::file_changed ()
 {
-       wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
+       auto ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK, this));
        DCPOMATIC_ASSERT (ok);
        ok->Enable (path().is_absolute());
 }