Merge.

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

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 526480912abade4c92ef56030b65f07bf928cd59..dda846b7db2cea232a4a840aef2be3a26cb199b6 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -47,6 +47,7 @@ private:
        void tms_user_changed (wxCommandEvent &);
        void tms_password_changed (wxCommandEvent &);
        void num_local_encoding_threads_changed (wxCommandEvent &);
+       void default_still_length_changed (wxCommandEvent &);
        void default_directory_changed (wxCommandEvent &);
        void edit_default_dci_metadata_clicked (wxCommandEvent &);
        void reference_scaler_changed (wxCommandEvent &);
@@ -56,7 +57,7 @@ private:
        void edit_server_clicked (wxCommandEvent &);
        void remove_server_clicked (wxCommandEvent &);
        void server_selection_changed (wxListEvent &);
-       void default_format_changed (wxCommandEvent &);
+       void default_container_changed (wxCommandEvent &);
        void default_dcp_content_type_changed (wxCommandEvent &);
        void issuer_changed (wxCommandEvent &);
        void creator_changed (wxCommandEvent &);
@@ -78,13 +79,14 @@ private:
        wxPanel* _metadata_panel;
        wxCheckBox* _set_language;
        wxChoice* _language;
-       wxChoice* _default_format;
+       wxChoice* _default_container;
        wxChoice* _default_dcp_content_type;
        wxTextCtrl* _tms_ip;
        wxTextCtrl* _tms_path;
        wxTextCtrl* _tms_user;
        wxTextCtrl* _tms_password;
        wxSpinCtrl* _num_local_encoding_threads;
+       wxSpinCtrl* _default_still_length;
 #ifdef __WXMSW__       
        DirPickerCtrl* _default_directory;
 #else