Merge master.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 56e54734b7dcac54e0a3ebad1317be4f6febdf13..6028a700de326764b02ffbdc78eff5f4fc77ab37 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -75,8 +75,8 @@ private:
        
        /* Handle changes to the view */
        void name_changed ();
-       void use_dci_name_toggled ();
-       void edit_dci_button_clicked ();
+       void use_isdcf_name_toggled ();
+       void edit_isdcf_button_clicked ();
        void content_selection_changed ();
        void content_add_file_clicked ();
        void content_add_folder_clicked ();
@@ -98,6 +98,7 @@ private:
        void three_d_changed ();
        void standard_changed ();
        void signed_toggled ();
+       void burn_subtitles_toggled ();
        void encrypted_toggled ();
 
        /* Handle changes to the model */
@@ -131,7 +132,7 @@ private:
        boost::shared_ptr<Film> _film;
        wxTextCtrl* _name;
        wxStaticText* _dcp_name;
-       wxCheckBox* _use_dci_name;
+       wxCheckBox* _use_isdcf_name;
        wxChoice* _container;
        wxListCtrl* _content;
        wxButton* _content_add_file;
@@ -141,7 +142,7 @@ private:
        wxButton* _content_later;
        wxButton* _content_timeline;
        wxCheckBox* _sequence_video;
-       wxButton* _edit_dci_button;
+       wxButton* _edit_isdcf_button;
        wxChoice* _scaler;
        wxSpinCtrl* _j2k_bandwidth;
        wxChoice* _dcp_content_type;
@@ -154,6 +155,7 @@ private:
        wxChoice* _resolution;
        wxChoice* _standard;
        wxCheckBox* _signed;
+       wxCheckBox* _burn_subtitles;
        wxCheckBox* _encrypted;
 
        ContentMenu _menu;