X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ffilm_editor.h;h=b204385bc34a868d054f5fd93b6895c64062576c;hb=988fa33f7d25f2f3319442ce3c9ed661172e4d56;hp=720e71902c9c4b804e6d9b15a498ca46a7466c98;hpb=d382f34db155ddaf4bb61538c18b87c7564e00b2;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 720e71902..b204385bc 100644
--- 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 &);
@@ -59,7 +62,11 @@ private:
 	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);
@@ -71,6 +78,8 @@ private:
 	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 *);
@@ -81,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 */
@@ -99,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 */
@@ -106,6 +119,9 @@ 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 */
 	wxComboBox* _dcp_content_type;
 	/** The Film's frames per second */