Update stream choices correctly when changed.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index c0e4ec3b4fd477c70f088a38bcab96d0c14d2a24..b204385bc34a868d054f5fd93b6895c64062576c 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -23,6 +23,8 @@
 
 #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"
 
@@ -39,25 +41,32 @@ public:
        void set_film (Film *);
        void setup_visibility ();
 
-//XXX  sigc::signal1<void, std::string> FileChanged;
+       sigc::signal1<void, std::string> FileChanged;
 
 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 &);
        void bottom_crop_changed (wxCommandEvent &);
        void content_changed (wxCommandEvent &);
-       void frames_per_second_changed (wxCommandEvent &);
        void format_changed (wxCommandEvent &);
        void dcp_range_changed (int, TrimAction);
        void dcp_content_type_changed (wxCommandEvent &);
        void dcp_ab_toggled (wxCommandEvent &);
        void scaler_changed (wxCommandEvent &);
        void audio_gain_changed (wxCommandEvent &);
+       void audio_gain_calculate_button_clicked (wxCommandEvent &);
        void audio_delay_changed (wxCommandEvent &);
+       void with_subtitles_toggled (wxCommandEvent &);
+       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);
@@ -67,20 +76,27 @@ private:
        void change_dcp_range_clicked (wxCommandEvent &);
 
        void set_things_sensitive (bool);
-
+       void setup_formats ();
+       void setup_subtitle_button ();
+       void setup_streams ();
+       void set_selected_stream (std::vector<Stream> const & streams, int id, wxComboBox* combo) const;
+       
        wxControl* video_control (wxControl *);
        wxControl* still_control (wxControl *);
 
+       Film::Property _ignore_changes;
+
        /** The film we are editing */
        Film* _film;
        /** The Film's name */
        wxTextCtrl* _name;
-       /** The Film's frames per second */
-       wxSpinCtrl* _frames_per_second;
+       wxStaticText* _dcp_name;
+       wxCheckBox* _use_dci_name;
+       wxButton* _edit_dci_button;
        /** The Film's format */
        wxComboBox* _format;
        /** The Film's content file */
-       wxFileCtrl* _content;
+       wxFilePickerCtrl* _content;
        /** The Film's left crop */
        wxSpinCtrl* _left_crop;
        /** The Film's right crop */
@@ -95,12 +111,21 @@ 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 */
+       wxButton* _audio_gain_calculate_button;
        /** 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 */
        wxComboBox* _dcp_content_type;
+       /** The Film's frames per second */
+       wxStaticText* _frames_per_second;
        /** The Film's original size */
        wxStaticText* _original_size;
        /** The Film's length */
@@ -117,20 +142,10 @@ private:
        /** Selector to generate an A/B comparison DCP */
        wxCheckBox* _dcp_ab;
 
-       wxFlexGridSizer* _sizer;
-       wxPanel* _audio_gain_panel;
-       wxBoxSizer* _audio_gain_sizer;
-       wxPanel* _audio_delay_panel;
-       wxBoxSizer* _audio_delay_sizer;
-       wxPanel* _filters_panel;
-       wxSizer* _filters_sizer;
-       wxSizer* _crop_sizer;
-       wxPanel* _crop_panel;
-       wxPanel* _dcp_range_panel;
-       wxSizer* _dcp_range_sizer;
-
        std::list<wxControl*> _video_controls;
        std::list<wxControl*> _still_controls;
 
-       std::list<wxControl*> _labels;
+       std::vector<Format const *> _formats;
+
+       wxSizer* _sizer;
 };