projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move y_pos to TimelineView.
[dcpomatic.git]
/
src
/
wx
/
dkdm_output_panel.h
diff --git
a/src/wx/dkdm_output_panel.h
b/src/wx/dkdm_output_panel.h
index 5b25dd2ab302e8b611154411d7afc95bea3da2ac..9bdbd5672153e6a7a854ac248f2cb72cd9b4552b 100644
(file)
--- a/
src/wx/dkdm_output_panel.h
+++ b/
src/wx/dkdm_output_panel.h
@@
-18,19
+18,26
@@
*/
*/
-#include "lib/kdm_with_metadata.h"
-#include "wx_util.h"
+
#include "name_format_editor.h"
#include "name_format_editor.h"
+#include "wx_util.h"
+#include "lib/kdm_with_metadata.h"
#include <dcp/types.h>
#include <dcp/types.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/filesystem.hpp>
#include <boost/filesystem.hpp>
-class wxRadioButton;
-class
wxDirPickerCtrl
;
+
+class
CheckBox
;
class DirPickerCtrl;
class DirPickerCtrl;
-class KDMTimingPanel;
class Job;
class Job;
+class KDMTimingPanel;
class Log;
class Log;
+class wxDirPickerCtrl;
+class wxRadioButton;
+
class DKDMOutputPanel : public wxPanel
{
class DKDMOutputPanel : public wxPanel
{
@@
-41,20
+48,19
@@
public:
boost::filesystem::path directory () const;
boost::filesystem::path directory () const;
- std::pair<
boost
::shared_ptr<Job>, int> make (
+ std::pair<
std
::shared_ptr<Job>, int> make (
std::list<KDMWithMetadataPtr > kdms,
std::string name,
std::list<KDMWithMetadataPtr > kdms,
std::string name,
-
boost
::function<bool (boost::filesystem::path)> confirm_overwrite
+
std
::function<bool (boost::filesystem::path)> confirm_overwrite
);
private:
);
private:
- wxChoice* _type;
NameFormatEditor* _filename_format;
NameFormatEditor* _filename_format;
-
wx
CheckBox* _write_to;
+ CheckBox* _write_to;
#ifdef DCPOMATIC_USE_OWN_PICKER
DirPickerCtrl* _folder;
#else
wxDirPickerCtrl* _folder;
#endif
#ifdef DCPOMATIC_USE_OWN_PICKER
DirPickerCtrl* _folder;
#else
wxDirPickerCtrl* _folder;
#endif
-
wx
CheckBox* _email;
+ CheckBox* _email;
};
};