Use libdcp's warnings.h

[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..50ea5ca485d15c81fea9afd172a298faf6f25632 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)