Merge FilmState / Film.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 31d8ad39b7d0bf3b4d5eb38503a4e7ddfcfcfda3..28afe7ff0f1341e6d98cb258b8556a134103a3e5 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -24,6 +24,7 @@
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
 #include <wx/filepicker.h>
+#include <wx/collpane.h>
 #include "lib/trim_action.h"
 #include "lib/film.h"
 
@@ -45,6 +46,8 @@ public:
 private:
        /* Handle changes to the view */
        void name_changed (wxCommandEvent &);
+       void use_dci_name_toggled (wxCommandEvent &);
+       void edit_dci_button_clicked (wxCommandEvent &);
        void left_crop_changed (wxCommandEvent &);
        void right_crop_changed (wxCommandEvent &);
        void top_crop_changed (wxCommandEvent &);
@@ -62,6 +65,8 @@ private:
        void subtitle_offset_changed (wxCommandEvent &);
        void subtitle_scale_changed (wxCommandEvent &);
        void still_duration_changed (wxCommandEvent &);
+       void audio_stream_changed (wxCommandEvent &);
+       void subtitle_stream_changed (wxCommandEvent &);
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
@@ -73,6 +78,8 @@ private:
        void set_things_sensitive (bool);
        void setup_formats ();
        void setup_subtitle_button ();
+       void setup_streams ();
+       void setup_audio_details ();
        
        wxControl* video_control (wxControl *);
        wxControl* still_control (wxControl *);
@@ -83,6 +90,9 @@ private:
        Film* _film;
        /** The Film's name */
        wxTextCtrl* _name;
+       wxStaticText* _dcp_name;
+       wxCheckBox* _use_dci_name;
+       wxButton* _edit_dci_button;
        /** The Film's format */
        wxComboBox* _format;
        /** The Film's content file */
@@ -101,6 +111,7 @@ private:
        wxButton* _filters_button;
        /** The Film's scaler */
        wxComboBox* _scaler;
+       wxComboBox* _audio_stream;
        /** The Film's audio gain */
        wxSpinCtrl* _audio_gain;
        /** A button to open the gain calculation dialogue */
@@ -108,6 +119,7 @@ private:
        /** The Film's audio delay */
        wxSpinCtrl* _audio_delay;
        wxCheckBox* _with_subtitles;
+       wxComboBox* _subtitle_stream;
        wxSpinCtrl* _subtitle_offset;
        wxSpinCtrl* _subtitle_scale;
        /** The Film's DCP content type */