Merge master.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 6b1d98ea64603ce5499a21ed5681c8c4ff46e625..ffffc1e76de853ffb03b045ff2c84d96517bb34e 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -16,7 +16,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-
+ 
 /** @file src/film_editor.h
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
  */
@@ -30,8 +30,10 @@
 
 class wxNotebook;
 class wxListCtrl;
+class wxListEvent;
 class Film;
 class AudioDialog;
+class AudioMappingView;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -61,12 +63,21 @@ private:
        void right_crop_changed (wxCommandEvent &);
        void top_crop_changed (wxCommandEvent &);
        void bottom_crop_changed (wxCommandEvent &);
-       void trust_content_header_changed (wxCommandEvent &);
+       void trust_content_headers_changed (wxCommandEvent &);
+       void content_selection_changed (wxListEvent &);
+       void content_activated (wxListEvent &);
+       void content_add_clicked (wxCommandEvent &);
+       void content_remove_clicked (wxCommandEvent &);
+       void content_edit_clicked (wxCommandEvent &);
+       void content_earlier_clicked (wxCommandEvent &);
+       void content_later_clicked (wxCommandEvent &);
+       void imagemagick_video_length_changed (wxCommandEvent &);
        void format_changed (wxCommandEvent &);
        void trim_start_changed (wxCommandEvent &);
        void trim_end_changed (wxCommandEvent &);
+       void trim_type_changed (wxCommandEvent &);
        void dcp_content_type_changed (wxCommandEvent &);
-       void dcp_ab_toggled (wxCommandEvent &);
+       void ab_toggled (wxCommandEvent &);
        void scaler_changed (wxCommandEvent &);
        void audio_gain_changed (wxCommandEvent &);
        void audio_gain_calculate_button_clicked (wxCommandEvent &);
@@ -81,12 +92,11 @@ private:
        void ffmpeg_subtitle_stream_changed (wxCommandEvent &);
        void dcp_frame_rate_changed (wxCommandEvent &);
        void best_dcp_frame_rate_clicked (wxCommandEvent &);
+       void edit_filters_clicked (wxCommandEvent &);
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
-
-       /* Button clicks */
-       void edit_filters_clicked (wxCommandEvent &);
+       void film_content_changed (boost::weak_ptr<Content>, int);
 
        void set_things_sensitive (bool);
        void setup_formats ();
@@ -95,9 +105,18 @@ private:
        void setup_audio_details ();
        void setup_dcp_name ();
        void setup_show_audio_sensitivity ();
+       void setup_scaling_description ();
+       void setup_notebook_size ();
+       void setup_frame_rate_description ();
        void setup_content ();
+       void setup_format ();
+       void setup_length ();
+       void setup_content_information ();
+       void setup_content_button_sensitivity ();
        
        void active_jobs_changed (bool);
+       boost::shared_ptr<Content> selected_content ();
+       void edit_content (boost::shared_ptr<Content>);
 
        wxNotebook* _notebook;
        wxPanel* _film_panel;
@@ -120,12 +139,15 @@ private:
        wxListCtrl* _content;
        wxButton* _content_add;
        wxButton* _content_remove;
+       wxButton* _content_edit;
        wxButton* _content_earlier;
        wxButton* _content_later;
+       wxTextCtrl* _content_information;
        wxButton* _edit_dci_button;
        wxChoice* _format;
        wxStaticText* _format_description;
-       wxCheckBox* _trust_content_header;
+       wxCheckBox* _trust_content_headers;
+       wxStaticText* _scaling_description;
        wxSpinCtrl* _left_crop;
        wxSpinCtrl* _right_crop;
        wxSpinCtrl* _top_crop;
@@ -137,6 +159,8 @@ private:
        wxButton* _audio_gain_calculate_button;
        wxButton* _show_audio;
        wxSpinCtrl* _audio_delay;
+       wxChoice* _ffmpeg_audio_stream;
+       AudioMappingView* _audio_mapping;
        wxCheckBox* _with_subtitles;
        wxChoice* _ffmpeg_subtitle_stream;
        wxSpinCtrl* _subtitle_offset;
@@ -144,19 +168,18 @@ private:
        wxChoice* _colour_lut;
        wxSpinCtrl* _j2k_bandwidth;
        wxChoice* _dcp_content_type;
-       wxStaticText* _source_frame_rate;
        wxChoice* _dcp_frame_rate;
        wxButton* _best_dcp_frame_rate;
        wxStaticText* _frame_rate_description;
-       wxStaticText* _original_size;
        wxStaticText* _length;
        /** The Film's audio details */
        wxStaticText* _audio;
 
        wxSpinCtrl* _trim_start;
        wxSpinCtrl* _trim_end;
+       wxChoice* _trim_type;
        /** Selector to generate an A/B comparison DCP */
-       wxCheckBox* _dcp_ab;
+       wxCheckBox* _ab;
 
        std::vector<Format const *> _formats;