Merge master.

[dcpomatic.git] / src / wx / kdm_dialog.h

diff --git a/src/wx/kdm_dialog.h b/src/wx/kdm_dialog.h
index 6327b29e8d1b84db982a3529b499da97150b31b3..0fc95db8443dee447023e7170b3ee964c0daef85 100644 (file)
--- a/src/wx/kdm_dialog.h
+++ b/src/wx/kdm_dialog.h
@@ -48,6 +48,7 @@ public:
        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>);
@@ -83,6 +84,7 @@ private:
        wxStaticText* _dcp_directory;
        wxStaticText* _cpl_id;
        wxStaticText* _cpl_annotation_text;
+       wxChoice* _type;
        wxRadioButton* _write_to;
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
        DirPickerCtrl* _folder;