X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=7de63014e718b1331350165e12a52a8b225dcd16;hb=ec5ff2e9bf1c81f9a11ff22ede039c83c2163885;hp=7e75b4bf00841fbcd766778471a989f7f81ec425;hpb=2247247a5294af70890cf68f3f9be930f3729d95;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 7e75b4bf0..7de63014e 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -29,8 +29,8 @@
 #include "lib/film.h"
 
 class wxNotebook;
-
 class Film;
+class AudioDialog;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -63,22 +63,27 @@ private:
 	void content_changed (wxCommandEvent &);
 	void trust_content_header_changed (wxCommandEvent &);
 	void format_changed (wxCommandEvent &);
-	void dcp_trim_start_changed (wxCommandEvent &);
-	void dcp_trim_end_changed (wxCommandEvent &);
+	void trim_start_changed (wxCommandEvent &);
+	void trim_end_changed (wxCommandEvent &);
 	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 show_audio_clicked (wxCommandEvent &);
 	void audio_delay_changed (wxCommandEvent &);
 	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 still_duration_changed (wxCommandEvent &);
 	void audio_stream_changed (wxCommandEvent &);
 	void subtitle_stream_changed (wxCommandEvent &);
 	void use_audio_changed (wxCommandEvent &);
 	void external_audio_changed (wxCommandEvent &);
+	void dcp_frame_rate_changed (wxCommandEvent &);
+	void best_dcp_frame_rate_clicked (wxCommandEvent &);
 
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
@@ -92,6 +97,9 @@ private:
 	void setup_audio_control_sensitivity ();
 	void setup_streams ();
 	void setup_audio_details ();
+	void setup_dcp_name ();
+	void setup_show_audio_sensitivity ();
+	void setup_scaling_description ();
 	
 	wxControl* video_control (wxControl *);
 	wxControl* still_control (wxControl *);
@@ -116,7 +124,8 @@ private:
 	wxCheckBox* _use_dci_name;
 	wxButton* _edit_dci_button;
 	/** The Film's format */
-	wxComboBox* _format;
+	wxChoice* _format;
+	wxStaticText* _scaling_description;
 	/** The Film's content file */
 	wxFilePickerCtrl* _content;
 	wxCheckBox* _trust_content_header;
@@ -133,25 +142,31 @@ private:
 	/** Button to open the filters dialogue */
 	wxButton* _filters_button;
 	/** The Film's scaler */
-	wxComboBox* _scaler;
+	wxChoice* _scaler;
 	wxRadioButton* _use_content_audio;
-	wxComboBox* _audio_stream;
+	wxChoice* _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 */
 	wxButton* _audio_gain_calculate_button;
+	wxButton* _show_audio;
 	/** The Film's audio delay */
 	wxSpinCtrl* _audio_delay;
 	wxCheckBox* _with_subtitles;
-	wxComboBox* _subtitle_stream;
+	wxChoice* _subtitle_stream;
 	wxSpinCtrl* _subtitle_offset;
 	wxSpinCtrl* _subtitle_scale;
+	wxChoice* _colour_lut;
+	wxSpinCtrl* _j2k_bandwidth;
 	/** The Film's DCP content type */
-	wxComboBox* _dcp_content_type;
-	/** The Film's frames per second */
-	wxStaticText* _frames_per_second;
+	wxChoice* _dcp_content_type;
+	/** The Film's source frame rate */
+	wxStaticText* _source_frame_rate;
+	wxChoice* _dcp_frame_rate;
+	wxButton* _best_dcp_frame_rate;
+	wxStaticText* _frame_rate_description;
 	/** The Film's original size */
 	wxStaticText* _original_size;
 	/** The Film's length */
@@ -161,8 +176,8 @@ private:
 	/** The Film's duration for still sources */
 	wxSpinCtrl* _still_duration;
 
-	wxSpinCtrl* _dcp_trim_start;
-	wxSpinCtrl* _dcp_trim_end;
+	wxSpinCtrl* _trim_start;
+	wxSpinCtrl* _trim_end;
 	/** Selector to generate an A/B comparison DCP */
 	wxCheckBox* _dcp_ab;
 
@@ -172,4 +187,5 @@ private:
 	std::vector<Format const *> _formats;
 
 	bool _generally_sensitive;
+	AudioDialog* _audio_dialog;
 };