X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=f2aaae04d62d02c722067d2d134ffdfd57930cdc;hb=adf17c5e1992186c7f8d63d9cffd087311164ffa;hp=89065c97d9cc5b4401d48c2393fef1b4a098fe2d;hpb=3e2e2fa63ce6e42efba734ced0099a2d87cd3290;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 89065c97d..f2aaae04d 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -35,7 +35,8 @@ class Film;
 class AudioDialog;
 class TimelineDialog;
 class AudioMappingView;
-class Format;
+class Ratio;
+class Timecode;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -46,6 +47,7 @@ public:
 	FilmEditor (boost::shared_ptr<Film>, wxWindow *);
 
 	void set_film (boost::shared_ptr<Film>);
+	void set_selection (boost::weak_ptr<Content>);
 
 	boost::signals2::signal<void (std::string)> FileChanged;
 
@@ -55,6 +57,7 @@ private:
 	void make_video_panel ();
 	void make_audio_panel ();
 	void make_subtitle_panel ();
+	void make_timing_panel ();
 	void connect_to_widgets ();
 	
 	/* Handle changes to the view */
@@ -80,7 +83,6 @@ private:
 	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 dcp_frame_rate_changed (wxCommandEvent &);
 	void best_dcp_frame_rate_clicked (wxCommandEvent &);
@@ -91,13 +93,17 @@ private:
 	void audio_stream_changed (wxCommandEvent &);
 	void subtitle_stream_changed (wxCommandEvent &);
 	void audio_mapping_changed (AudioMapping);
+	void start_changed ();
+	void length_changed ();
+	void ratio_changed (wxCommandEvent &);
+	void dcp_audio_channels_changed (wxCommandEvent &);
 
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
 	void film_content_changed (boost::weak_ptr<Content>, int);
 
 	void set_things_sensitive (bool);
-	void setup_formats ();
+	void setup_ratios ();
 	void setup_subtitle_control_sensitivity ();
 	void setup_dcp_name ();
 	void setup_show_audio_sensitivity ();
@@ -112,6 +118,7 @@ private:
 	boost::shared_ptr<Content> selected_content ();
 	boost::shared_ptr<VideoContent> selected_video_content ();
 	boost::shared_ptr<AudioContent> selected_audio_content ();
+	boost::shared_ptr<SubtitleContent> selected_subtitle_content ();
 
 	wxNotebook* _main_notebook;
 	wxNotebook* _content_notebook;
@@ -120,11 +127,9 @@ private:
 	wxPanel* _content_panel;
 	wxSizer* _content_sizer;
 	wxPanel* _video_panel;
-	wxSizer* _video_sizer;
 	wxPanel* _audio_panel;
-	wxSizer* _audio_sizer;
 	wxPanel* _subtitle_panel;
-	wxSizer* _subtitle_sizer;
+	wxPanel* _timing_panel;
 
 	/** The film we are editing */
 	boost::shared_ptr<Film> _film;
@@ -141,8 +146,8 @@ private:
 	wxCheckBox* _loop_content;
 	wxSpinCtrl* _loop_count;
 	wxButton* _edit_dci_button;
-	wxChoice* _format;
-	wxStaticText* _format_description;
+	wxChoice* _ratio;
+	wxStaticText* _ratio_description;
 	wxStaticText* _scaling_description;
 	wxSpinCtrl* _left_crop;
 	wxSpinCtrl* _right_crop;
@@ -158,17 +163,19 @@ private:
 	wxCheckBox* _with_subtitles;
 	wxSpinCtrl* _subtitle_offset;
 	wxSpinCtrl* _subtitle_scale;
-	wxChoice* _colour_lut;
 	wxSpinCtrl* _j2k_bandwidth;
 	wxChoice* _dcp_content_type;
 	wxChoice* _dcp_frame_rate;
+	wxSpinCtrl* _dcp_audio_channels;
 	wxButton* _best_dcp_frame_rate;
 	wxChoice* _audio_stream;
 	wxStaticText* _audio_description;
 	wxChoice* _subtitle_stream;
 	AudioMappingView* _audio_mapping;
+	Timecode* _start;
+	Timecode* _length;
 
-	std::vector<Format const *> _formats;
+	std::vector<Ratio const *> _ratios;
 
 	bool _generally_sensitive;
 	AudioDialog* _audio_dialog;