projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable warnings around all wx includes.
[dcpomatic.git]
/
src
/
wx
/
kdm_output_panel.h
diff --git
a/src/wx/kdm_output_panel.h
b/src/wx/kdm_output_panel.h
index cb6f9a1ca69fe85f044d3ef7562ceec578dc548b..829b26544a679bc8a303b752e21965da7bf180ba 100644
(file)
--- a/
src/wx/kdm_output_panel.h
+++ b/
src/wx/kdm_output_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2015-20
17
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-20
22
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,40
+18,57
@@
*/
*/
-#include "lib/screen_kdm.h"
+
#include "wx_util.h"
#include "wx_util.h"
-#include "name_format_editor.h"
+#include "lib/kdm_with_metadata.h"
+#include "lib/warnings.h"
#include <dcp/types.h>
#include <dcp/types.h>
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
-class wxRadioButton;
-class wxDirPickerCtrl;
+
class DirPickerCtrl;
class DirPickerCtrl;
-class KDMTimingPanel;
class Job;
class Job;
-class Log;
+class KDMChoice;
+class NameFormatEditor;
+class wxDirPickerCtrl;
+class wxRadioButton;
+
class KDMOutputPanel : public wxPanel
{
public:
class KDMOutputPanel : public wxPanel
{
public:
- KDMOutputPanel (wxWindow* parent
, bool interop
);
+ KDMOutputPanel (wxWindow* parent);
void setup_sensitivity ();
boost::filesystem::path directory () const;
dcp::Formulation formulation () const;
void setup_sensitivity ();
boost::filesystem::path directory () const;
dcp::Formulation formulation () const;
+ bool forensic_mark_video () const {
+ return _forensic_mark_video;
+ }
+ bool forensic_mark_audio () const {
+ return _forensic_mark_audio;
+ }
+ boost::optional<int> forensic_mark_audio_up_to () const {
+ return _forensic_mark_audio_up_to;
+ }
- std::pair<
boost
::shared_ptr<Job>, int> make (
- std::list<
ScreenKDM
> screen_kdms,
+ std::pair<
std
::shared_ptr<Job>, int> make (
+ std::list<
KDMWithMetadataPtr
> screen_kdms,
std::string name,
std::string name,
- KDMTimingPanel* timing,
- boost::function<bool (boost::filesystem::path)> confirm_overwrite,
- boost::shared_ptr<Log> log
+ std::function<bool (boost::filesystem::path)> confirm_overwrite
);
private:
);
private:
- wxChoice* _type;
+ void kdm_write_type_changed ();
+ void advanced_clicked ();
+ void write_to_changed ();
+ void email_changed ();
+
+ KDMChoice* _type;
NameFormatEditor* _container_name_format;
NameFormatEditor* _filename_format;
wxCheckBox* _write_to;
NameFormatEditor* _container_name_format;
NameFormatEditor* _filename_format;
wxCheckBox* _write_to;
@@
-64,4
+81,7
@@
private:
wxRadioButton* _write_folder;
wxRadioButton* _write_zip;
wxCheckBox* _email;
wxRadioButton* _write_folder;
wxRadioButton* _write_zip;
wxCheckBox* _email;
+ bool _forensic_mark_video;
+ bool _forensic_mark_audio;
+ boost::optional<int> _forensic_mark_audio_up_to;
};
};