X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=41f7bfd1be037e34c04552a577b1a1298b917493;hb=bdbddbe89d4996a39dc6e695f23a6457c03774ae;hp=80072d48abf6a2d333a3f1d6dc37e310023a2a14;hpb=b468ccabdb13fca86ae8a324239d83490ef5832e;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 80072d48a..41f7bfd1b 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -16,7 +16,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-
+ 
 /** @file src/film_editor.h
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
  */
@@ -33,6 +33,8 @@ class wxListCtrl;
 class wxListEvent;
 class Film;
 class AudioDialog;
+class AudioMappingView;
+class TimelineDialog;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -63,14 +65,18 @@ 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_properties_clicked (wxCommandEvent &);
 	void content_earlier_clicked (wxCommandEvent &);
 	void content_later_clicked (wxCommandEvent &);
+	void imagemagick_video_length_changed (wxCommandEvent &);
 	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 &);
@@ -83,28 +89,35 @@ private:
 	void subtitle_scale_changed (wxCommandEvent &);
 	void colour_lut_changed (wxCommandEvent &);
 	void j2k_bandwidth_changed (wxCommandEvent &);
-	void ffmpeg_audio_stream_changed (wxCommandEvent &);
-	void ffmpeg_subtitle_stream_changed (wxCommandEvent &);
 	void dcp_frame_rate_changed (wxCommandEvent &);
 	void best_dcp_frame_rate_clicked (wxCommandEvent &);
+	void edit_filters_clicked (wxCommandEvent &);
+	void loop_content_toggled (wxCommandEvent &);
+	void loop_count_changed (wxCommandEvent &);
+	void content_timeline_clicked (wxCommandEvent &);
 
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
-
-	/* Button clicks */
-	void edit_filters_clicked (wxCommandEvent &);
+	void film_content_changed (boost::weak_ptr<Content>, int);
 
 	void set_things_sensitive (bool);
 	void setup_formats ();
 	void setup_subtitle_control_sensitivity ();
-	void setup_streams ();
-	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_format ();
+	void setup_length ();
+	void setup_content_information ();
 	void setup_content_button_sensitivity ();
+	void setup_loop_sensitivity ();
 	
 	void active_jobs_changed (bool);
+	boost::shared_ptr<Content> selected_content ();
+	void content_properties (boost::shared_ptr<Content>);
 
 	wxNotebook* _notebook;
 	wxPanel* _film_panel;
@@ -127,12 +140,18 @@ private:
 	wxListCtrl* _content;
 	wxButton* _content_add;
 	wxButton* _content_remove;
+	wxButton* _content_properties;
 	wxButton* _content_earlier;
 	wxButton* _content_later;
+	wxButton* _content_timeline;
+	wxTextCtrl* _content_information;
+	wxCheckBox* _loop_content;
+	wxSpinCtrl* _loop_count;
 	wxButton* _edit_dci_button;
 	wxChoice* _format;
 	wxStaticText* _format_description;
 	wxCheckBox* _trust_content_headers;
+	wxStaticText* _scaling_description;
 	wxSpinCtrl* _left_crop;
 	wxSpinCtrl* _right_crop;
 	wxSpinCtrl* _top_crop;
@@ -144,8 +163,8 @@ private:
 	wxButton* _audio_gain_calculate_button;
 	wxButton* _show_audio;
 	wxSpinCtrl* _audio_delay;
+	AudioMappingView* _audio_mapping;
 	wxCheckBox* _with_subtitles;
-	wxChoice* _ffmpeg_subtitle_stream;
 	wxSpinCtrl* _subtitle_offset;
 	wxSpinCtrl* _subtitle_scale;
 	wxChoice* _colour_lut;
@@ -154,13 +173,13 @@ private:
 	wxChoice* _dcp_frame_rate;
 	wxButton* _best_dcp_frame_rate;
 	wxStaticText* _frame_rate_description;
-	wxStaticText* _original_size;
 	wxStaticText* _length;
 	/** The Film's audio details */
 	wxStaticText* _audio;
 
 	wxSpinCtrl* _trim_start;
 	wxSpinCtrl* _trim_end;
+	wxChoice* _trim_type;
 	/** Selector to generate an A/B comparison DCP */
 	wxCheckBox* _ab;
 
@@ -168,4 +187,5 @@ private:
 
 	bool _generally_sensitive;
 	AudioDialog* _audio_dialog;
+	TimelineDialog* _timeline_dialog;
 };