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 db51d6d0380baf0dba4c8f510d5625396cac0c46..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_util.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <map>
 
 class wxTreeCtrl;
 class wxDatePickerCtrl;
@@ -32,6 +33,8 @@ class DirPickerCtrl;
 
 class Cinema;
 class Screen;
+class Film;
+struct CPLSummary;
 
 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::filesystem::path dcp () 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>);
@@ -61,9 +65,12 @@ private:
        std::list<std::pair<wxTreeItemId, boost::shared_ptr<Cinema> > > selected_cinemas () const;
        std::list<std::pair<wxTreeItemId, boost::shared_ptr<Screen> > > selected_screens () const;
        void setup_sensitivity ();
+       void update_cpl_choice ();
+       void update_cpl_summary ();
+       void cpl_browse_clicked ();
 
        static boost::posix_time::ptime posix_time (wxDatePickerCtrl *, wxTimePickerCtrl *);
-       
+
        wxTreeCtrl* _targets;
        wxButton* _add_cinema;
        wxButton* _edit_cinema;
@@ -75,7 +82,12 @@ private:
        wxDatePickerCtrl* _until_date;
        wxTimePickerCtrl* _from_time;
        wxTimePickerCtrl* _until_time;
-       wxListCtrl* _dcps;
+       wxChoice* _cpl;
+       wxButton* _cpl_browse;
+       wxStaticText* _dcp_directory;
+       wxStaticText* _cpl_id;
+       wxStaticText* _cpl_annotation_text;
+       wxChoice* _type;
        wxRadioButton* _write_to;
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
        DirPickerCtrl* _folder;
@@ -87,4 +99,5 @@ private:
        wxTreeItemId _root;
        std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas;
        std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens;
+       std::vector<CPLSummary> _cpls;
 };