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

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index ffffc1e76..41f7bfd1b 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -34,6 +34,7 @@ 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.
@@ -68,7 +69,7 @@ private:
 	void content_activated (wxListEvent &);
 	void content_add_clicked (wxCommandEvent &);
 	void content_remove_clicked (wxCommandEvent &);
-	void content_edit_clicked (wxCommandEvent &);
+	void content_properties_clicked (wxCommandEvent &);
 	void content_earlier_clicked (wxCommandEvent &);
 	void content_later_clicked (wxCommandEvent &);
 	void imagemagick_video_length_changed (wxCommandEvent &);
@@ -88,11 +89,12 @@ 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);
@@ -101,8 +103,6 @@ private:
 	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 ();
@@ -113,10 +113,11 @@ private:
 	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 edit_content (boost::shared_ptr<Content>);
+	void content_properties (boost::shared_ptr<Content>);
 
 	wxNotebook* _notebook;
 	wxPanel* _film_panel;
@@ -139,10 +140,13 @@ private:
 	wxListCtrl* _content;
 	wxButton* _content_add;
 	wxButton* _content_remove;
-	wxButton* _content_edit;
+	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;
@@ -159,10 +163,8 @@ private:
 	wxButton* _audio_gain_calculate_button;
 	wxButton* _show_audio;
 	wxSpinCtrl* _audio_delay;
-	wxChoice* _ffmpeg_audio_stream;
 	AudioMappingView* _audio_mapping;
 	wxCheckBox* _with_subtitles;
-	wxChoice* _ffmpeg_subtitle_stream;
 	wxSpinCtrl* _subtitle_offset;
 	wxSpinCtrl* _subtitle_scale;
 	wxChoice* _colour_lut;
@@ -185,4 +187,5 @@ private:
 
 	bool _generally_sensitive;
 	AudioDialog* _audio_dialog;
+	TimelineDialog* _timeline_dialog;
 };