98772641729700876a0e51e3d001649cd1624046 from master; Windows crash fix.

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

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 060ec31ff972c55cd99830821c313de315fbdef7..96786d8a1d93ef912881498e796fc2654b4c2501 100644 (file)
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -55,7 +55,6 @@ private:
        void copy_isdcf_name_button_clicked ();
        void container_changed ();
        void dcp_content_type_changed ();
-       void scaler_changed ();
        void j2k_bandwidth_changed ();
        void frame_rate_choice_changed ();
        void frame_rate_spin_changed ();
@@ -68,6 +67,7 @@ private:
        void signed_toggled ();
        void burn_subtitles_toggled ();
        void encrypted_toggled ();
+       void edit_key_clicked ();
 
        void setup_frame_rate_widget ();
        void setup_container ();
@@ -89,13 +89,12 @@ private:
        wxChoice* _container;
        wxButton* _edit_isdcf_button;
        wxButton* _copy_isdcf_name_button;
-       wxChoice* _scaler;
        wxSpinCtrl* _j2k_bandwidth;
        wxChoice* _dcp_content_type;
        wxChoice* _frame_rate_choice;
        wxSpinCtrl* _frame_rate_spin;
        wxSizer* _frame_rate_sizer;
-       wxSpinCtrl* _audio_channels;
+       wxChoice* _audio_channels;
        wxButton* _best_frame_rate;
        wxCheckBox* _three_d;
        wxChoice* _resolution;
@@ -103,6 +102,8 @@ private:
        wxCheckBox* _signed;
        wxCheckBox* _burn_subtitles;
        wxCheckBox* _encrypted;
+       wxStaticText* _key;
+       wxButton* _edit_key;
 
        boost::shared_ptr<Film> _film;
        bool _generally_sensitive;