Merge.

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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 4b096a2e15242ac592280e6075da30e8798a6f7d..f2aaae04d62d02c722067d2d134ffdfd57930cdc 100644 (file)
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -83,7 +83,6 @@ private:
        void with_subtitles_toggled (wxCommandEvent &);
        void subtitle_offset_changed (wxCommandEvent &);
        void subtitle_scale_changed (wxCommandEvent &);
-       void colour_lut_changed (wxCommandEvent &);
        void j2k_bandwidth_changed (wxCommandEvent &);
        void dcp_frame_rate_changed (wxCommandEvent &);
        void best_dcp_frame_rate_clicked (wxCommandEvent &);
@@ -97,6 +96,7 @@ private:
        void start_changed ();
        void length_changed ();
        void ratio_changed (wxCommandEvent &);
+       void dcp_audio_channels_changed (wxCommandEvent &);
 
        /* Handle changes to the model */
        void film_changed (Film::Property);
@@ -118,6 +118,7 @@ private:
        boost::shared_ptr<Content> selected_content ();
        boost::shared_ptr<VideoContent> selected_video_content ();
        boost::shared_ptr<AudioContent> selected_audio_content ();
+       boost::shared_ptr<SubtitleContent> selected_subtitle_content ();
 
        wxNotebook* _main_notebook;
        wxNotebook* _content_notebook;
@@ -162,10 +163,10 @@ private:
        wxCheckBox* _with_subtitles;
        wxSpinCtrl* _subtitle_offset;
        wxSpinCtrl* _subtitle_scale;
-       wxChoice* _colour_lut;
        wxSpinCtrl* _j2k_bandwidth;
        wxChoice* _dcp_content_type;
        wxChoice* _dcp_frame_rate;
+       wxSpinCtrl* _dcp_audio_channels;
        wxButton* _best_dcp_frame_rate;
        wxChoice* _audio_stream;
        wxStaticText* _audio_description;