Merge branch 'master' into speed-up

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index e9f8d35e5ca349e1bdaed1ecf19826847366bc9d..7e75b4bf00841fbcd766778471a989f7f81ec425 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -28,6 +28,8 @@
 #include <boost/signals2.hpp>
 #include "lib/film.h"
 
+class wxNotebook;
+
 class Film;
 
 /** @class FilmEditor
@@ -44,6 +46,12 @@ public:
        boost::signals2::signal<void (std::string)> FileChanged;
 
 private:
+       void make_film_panel ();
+       void make_video_panel ();
+       void make_audio_panel ();
+       void make_subtitle_panel ();
+       void connect_to_widgets ();
+       
        /* Handle changes to the view */
        void name_changed (wxCommandEvent &);
        void use_dci_name_toggled (wxCommandEvent &);
@@ -53,8 +61,10 @@ private:
        void top_crop_changed (wxCommandEvent &);
        void bottom_crop_changed (wxCommandEvent &);
        void content_changed (wxCommandEvent &);
+       void trust_content_header_changed (wxCommandEvent &);
        void format_changed (wxCommandEvent &);
-       void dcp_range_changed (int, int);
+       void dcp_trim_start_changed (wxCommandEvent &);
+       void dcp_trim_end_changed (wxCommandEvent &);
        void dcp_content_type_changed (wxCommandEvent &);
        void dcp_ab_toggled (wxCommandEvent &);
        void scaler_changed (wxCommandEvent &);
@@ -67,17 +77,19 @@ private:
        void still_duration_changed (wxCommandEvent &);
        void audio_stream_changed (wxCommandEvent &);
        void subtitle_stream_changed (wxCommandEvent &);
+       void use_audio_changed (wxCommandEvent &);
+       void external_audio_changed (wxCommandEvent &);
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
 
        /* Button clicks */
        void edit_filters_clicked (wxCommandEvent &);
-       void change_dcp_range_clicked (wxCommandEvent &);
 
        void set_things_sensitive (bool);
        void setup_formats ();
-       void setup_subtitle_button ();
+       void setup_subtitle_control_sensitivity ();
+       void setup_audio_control_sensitivity ();
        void setup_streams ();
        void setup_audio_details ();
        
@@ -86,7 +98,15 @@ private:
 
        void active_jobs_changed (bool);
 
-       Film::Property _ignore_changes;
+       wxNotebook* _notebook;
+       wxPanel* _film_panel;
+       wxSizer* _film_sizer;
+       wxPanel* _video_panel;
+       wxSizer* _video_sizer;
+       wxPanel* _audio_panel;
+       wxSizer* _audio_sizer;
+       wxPanel* _subtitle_panel;
+       wxSizer* _subtitle_sizer;
 
        /** The film we are editing */
        boost::shared_ptr<Film> _film;
@@ -99,6 +119,7 @@ private:
        wxComboBox* _format;
        /** The Film's content file */
        wxFilePickerCtrl* _content;
+       wxCheckBox* _trust_content_header;
        /** The Film's left crop */
        wxSpinCtrl* _left_crop;
        /** The Film's right crop */
@@ -113,7 +134,10 @@ private:
        wxButton* _filters_button;
        /** The Film's scaler */
        wxComboBox* _scaler;
+       wxRadioButton* _use_content_audio;
        wxComboBox* _audio_stream;
+       wxRadioButton* _use_external_audio;
+       wxFilePickerCtrl* _external_audio[MAX_AUDIO_CHANNELS];
        /** The Film's audio gain */
        wxSpinCtrl* _audio_gain;
        /** A button to open the gain calculation dialogue */
@@ -137,10 +161,8 @@ private:
        /** The Film's duration for still sources */
        wxSpinCtrl* _still_duration;
 
-       /** Display of the range of frames that will be used */
-       wxStaticText* _dcp_range;
-       /** Button to change the range */
-       wxButton* _change_dcp_range_button;
+       wxSpinCtrl* _dcp_trim_start;
+       wxSpinCtrl* _dcp_trim_end;
        /** Selector to generate an A/B comparison DCP */
        wxCheckBox* _dcp_ab;
 
@@ -149,5 +171,5 @@ private:
 
        std::vector<Format const *> _formats;
 
-       wxSizer* _sizer;
+       bool _generally_sensitive;
 };