X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=ffffc1e76de853ffb03b045ff2c84d96517bb34e;hb=147cca5876dfbdf56e21289c3a36bec4b4850191;hp=b6f6a24eec87cdf6f025d2f3e8d0ad2d7f013816;hpb=8750efb9e072cf3b42e6c3c29521c7031c0b5dfd;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index b6f6a24ee..ffffc1e76 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -33,6 +33,7 @@ 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.
@@ -63,7 +64,8 @@ private:
 	void top_crop_changed (wxCommandEvent &);
 	void bottom_crop_changed (wxCommandEvent &);
 	void trust_content_headers_changed (wxCommandEvent &);
-	void content_item_selected (wxListEvent &);
+	void content_selection_changed (wxListEvent &);
+	void content_activated (wxListEvent &);
 	void content_add_clicked (wxCommandEvent &);
 	void content_remove_clicked (wxCommandEvent &);
 	void content_edit_clicked (wxCommandEvent &);
@@ -73,6 +75,7 @@ private:
 	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 ab_toggled (wxCommandEvent &);
 	void scaler_changed (wxCommandEvent &);
@@ -102,14 +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_content_button_sensitivity ();
-	void setup_length ();
 	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;
@@ -140,6 +147,7 @@ private:
 	wxChoice* _format;
 	wxStaticText* _format_description;
 	wxCheckBox* _trust_content_headers;
+	wxStaticText* _scaling_description;
 	wxSpinCtrl* _left_crop;
 	wxSpinCtrl* _right_crop;
 	wxSpinCtrl* _top_crop;
@@ -152,6 +160,7 @@ private:
 	wxButton* _show_audio;
 	wxSpinCtrl* _audio_delay;
 	wxChoice* _ffmpeg_audio_stream;
+	AudioMappingView* _audio_mapping;
 	wxCheckBox* _with_subtitles;
 	wxChoice* _ffmpeg_subtitle_stream;
 	wxSpinCtrl* _subtitle_offset;
@@ -168,6 +177,7 @@ private:
 
 	wxSpinCtrl* _trim_start;
 	wxSpinCtrl* _trim_end;
+	wxChoice* _trim_type;
 	/** Selector to generate an A/B comparison DCP */
 	wxCheckBox* _ab;