projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 "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>
#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;
using std::string;
using boost::bind;
+
#define FORMATS 2
#define FORMATS 2
+
wxString format_names[] = {
wxString format_names[] = {
- _("ProRes"),
+ _("
MOV /
ProRes"),
_("MP4 / H.264"),
};
_("MP4 / H.264"),
};
@@
-49,8
+53,8
@@
wxString format_extensions[] = {
};
ExportFormat formats[] = {
};
ExportFormat formats[] = {
- E
XPORT_FORMAT_
PRORES,
- E
XPORT_FORMAT_
H264_AAC,
+ E
xportFormat::
PRORES,
+ E
xportFormat::
H264_AAC,
};
ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)
};
ExportVideoFileDialog::ExportVideoFileDialog (wxWindow* parent, string name)