X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=31d8ad39b7d0bf3b4d5eb38503a4e7ddfcfcfda3;hb=129afab72bfc026b5704c41a6bfc0f4b3a2c4033;hp=2227a6d647544d8ce85032a550110d0c45e6c3ba;hpb=3d4faebe28da789a9083e6a2cc0b345df6c17306;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 2227a6d64..31d8ad39b 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -23,6 +23,7 @@
 
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
+#include <wx/filepicker.h>
 #include "lib/trim_action.h"
 #include "lib/film.h"
 
@@ -39,7 +40,7 @@ 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 */
@@ -49,14 +50,17 @@ private:
 	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 &);
 
 	/* Handle changes to the model */
@@ -67,20 +71,22 @@ private:
 	void change_dcp_range_clicked (wxCommandEvent &);
 
 	void set_things_sensitive (bool);
-
+	void setup_formats ();
+	void setup_subtitle_button ();
+	
 	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;
 	/** 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 */
@@ -97,10 +103,17 @@ private:
 	wxComboBox* _scaler;
 	/** 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;
+	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,24 +130,10 @@ private:
 	/** Selector to generate an A/B comparison DCP */
 	wxCheckBox* _dcp_ab;
 
-	wxFlexGridSizer* _sizer;
-	wxStaticText* _name_label;
-	wxStaticText* _content_label;
-	wxStaticText* _dcp_content_type_label;
-	wxStaticText* _frames_per_second_label;
-	wxStaticText* _format_label;
-	wxStaticText* _crop_label;
-	wxSizer* _crop_sizer;
-	wxPanel* _crop_panel;
-	wxStaticText* _left_crop_label;
-	wxStaticText* _right_crop_label;
-	wxStaticText* _top_crop_label;
-	wxStaticText* _bottom_crop_label;
-	wxStaticText* _filters_label;
-	wxStaticText* _scaler_label;
-
 	std::list<wxControl*> _video_controls;
 	std::list<wxControl*> _still_controls;
 
-	std::list<wxControl*> _labels;
+	std::vector<Format const *> _formats;
+
+	wxSizer* _sizer;
 };