projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash reported on OS X, although the actual cause is not entirely clear.
[dcpomatic.git]
/
src
/
wx
/
kdm_dialog.h
diff --git
a/src/wx/kdm_dialog.h
b/src/wx/kdm_dialog.h
index 6327b29e8d1b84db982a3529b499da97150b31b3..2621cbbfe70b1ddb4c22d07552c8ed329702851a 100644
(file)
--- a/
src/wx/kdm_dialog.h
+++ b/
src/wx/kdm_dialog.h
@@
-17,12
+17,13
@@
*/
*/
-#include <map>
-#include <boost/shared_ptr.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
+#include "wx_util.h"
+#include <dcp/types.h>
#include <wx/wx.h>
#include <wx/treectrl.h>
#include <wx/wx.h>
#include <wx/treectrl.h>
-#include "wx_util.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <map>
class wxTreeCtrl;
class wxDatePickerCtrl;
class wxTreeCtrl;
class wxDatePickerCtrl;
@@
-32,6
+33,8
@@
class DirPickerCtrl;
class Cinema;
class Screen;
class Cinema;
class Screen;
+class Film;
+struct CPLSummary;
class KDMDialog : public wxDialog
{
class KDMDialog : public wxDialog
{
@@
-44,10
+47,11
@@
public:
boost::posix_time::ptime from () const;
/** @return KDM until time in local time */
boost::posix_time::ptime until () const;
boost::posix_time::ptime from () const;
/** @return KDM until time in local time */
boost::posix_time::ptime until () const;
-
+
boost::filesystem::path cpl () const;
boost::filesystem::path directory () const;
bool write_to () const;
boost::filesystem::path cpl () const;
boost::filesystem::path directory () const;
bool write_to () const;
+ dcp::Formulation formulation () const;
private:
void add_cinema (boost::shared_ptr<Cinema>);
private:
void add_cinema (boost::shared_ptr<Cinema>);
@@
-66,7
+70,7
@@
private:
void cpl_browse_clicked ();
static boost::posix_time::ptime posix_time (wxDatePickerCtrl *, wxTimePickerCtrl *);
void cpl_browse_clicked ();
static boost::posix_time::ptime posix_time (wxDatePickerCtrl *, wxTimePickerCtrl *);
-
+
wxTreeCtrl* _targets;
wxButton* _add_cinema;
wxButton* _edit_cinema;
wxTreeCtrl* _targets;
wxButton* _add_cinema;
wxButton* _edit_cinema;
@@
-83,6
+87,7
@@
private:
wxStaticText* _dcp_directory;
wxStaticText* _cpl_id;
wxStaticText* _cpl_annotation_text;
wxStaticText* _dcp_directory;
wxStaticText* _cpl_id;
wxStaticText* _cpl_annotation_text;
+ wxChoice* _type;
wxRadioButton* _write_to;
#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
DirPickerCtrl* _folder;
wxRadioButton* _write_to;
#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
DirPickerCtrl* _folder;