X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=bb217211ca7719c0e58ba4a8cb22854726ec8961;hb=373f010a7f04add1f49169cbaa60cb7ae5f508d4;hp=ff9198be42a60fc910110ea88b52ca054596097b;hpb=eceeb0c13cdaf08204968047269b49d8d493f741;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index ff9198be4..bb217211c 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -36,9 +36,8 @@ class Film;
 class TimelineDialog;
 class Ratio;
 class Timecode;
-class TimingPanel;
-class SubtitlePanel;
-class AudioPanel;
+class FilmEditorPanel;
+class SubtitleContent;
 
 /** @class FilmEditor
  *  @brief A wx widget to edit a film's metadata, and perform various functions.
@@ -68,60 +67,51 @@ public:
 	boost::shared_ptr<AudioContent> selected_audio_content ();
 	boost::shared_ptr<SubtitleContent> selected_subtitle_content ();
 	
-	bool generally_sensitive () const {
-		return _generally_sensitive;
-	}
-
 private:
 	void make_dcp_panel ();
 	void make_content_panel ();
-	void make_video_panel ();
 	void connect_to_widgets ();
 	
 	/* Handle changes to the view */
-	void name_changed (wxCommandEvent &);
-	void use_dci_name_toggled (wxCommandEvent &);
-	void edit_dci_button_clicked (wxCommandEvent &);
-	void left_crop_changed (wxCommandEvent &);
-	void right_crop_changed (wxCommandEvent &);
-	void top_crop_changed (wxCommandEvent &);
-	void bottom_crop_changed (wxCommandEvent &);
-	void trust_content_headers_changed (wxCommandEvent &);
-	void content_selection_changed (wxListEvent &);
-	void content_add_clicked (wxCommandEvent &);
-	void content_remove_clicked (wxCommandEvent &);
-	void imagemagick_video_length_changed (wxCommandEvent &);
-	void container_changed (wxCommandEvent &);
-	void dcp_content_type_changed (wxCommandEvent &);
-	void scaler_changed (wxCommandEvent &);
-	void j2k_bandwidth_changed (wxCommandEvent &);
-	void dcp_frame_rate_changed (wxCommandEvent &);
-	void best_dcp_frame_rate_clicked (wxCommandEvent &);
-	void edit_filters_clicked (wxCommandEvent &);
-	void content_timeline_clicked (wxCommandEvent &);
-	void ratio_changed (wxCommandEvent &);
-	void dcp_audio_channels_changed (wxCommandEvent &);
-	void dcp_resolution_changed (wxCommandEvent &);
-	void sequence_video_changed (wxCommandEvent &);
+	void name_changed ();
+	void use_dci_name_toggled ();
+	void edit_dci_button_clicked ();
+	void content_selection_changed ();
+	void content_add_file_clicked ();
+	void content_add_folder_clicked ();
+	void content_remove_clicked ();
+	void container_changed ();
+	void dcp_content_type_changed ();
+	void scaler_changed ();
+	void j2k_bandwidth_changed ();
+	void frame_rate_changed ();
+	void best_frame_rate_clicked ();
+	void content_timeline_clicked ();
+	void audio_channels_changed ();
+	void resolution_changed ();
+	void sequence_video_changed ();
 	void content_right_click (wxListEvent &);
+	void three_d_changed ();
+	void standard_changed ();
+	void encrypted_toggled ();
 
 	/* 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_ratios ();
+	void set_general_sensitivity (bool);
 	void setup_dcp_name ();
-	void setup_scaling_description ();
 	void setup_content ();
 	void setup_container ();
 	void setup_content_sensitivity ();
 	
 	void active_jobs_changed (bool);
 
-	AudioPanel* _audio_panel;
-	SubtitlePanel* _subtitle_panel;
-	TimingPanel* _timing_panel;
+	FilmEditorPanel* _video_panel;
+	FilmEditorPanel* _audio_panel;
+	FilmEditorPanel* _subtitle_panel;
+	FilmEditorPanel* _timing_panel;
+	std::list<FilmEditorPanel *> _panels;
 
 	wxNotebook* _main_notebook;
 	wxNotebook* _content_notebook;
@@ -129,7 +119,6 @@ private:
 	wxSizer* _dcp_sizer;
 	wxPanel* _content_panel;
 	wxSizer* _content_sizer;
-	wxPanel* _video_panel;
 
 	/** The film we are editing */
 	boost::shared_ptr<Film> _film;
@@ -138,29 +127,24 @@ private:
 	wxCheckBox* _use_dci_name;
 	wxChoice* _container;
 	wxListCtrl* _content;
-	wxButton* _content_add;
+	wxButton* _content_add_file;
+	wxButton* _content_add_folder;
 	wxButton* _content_remove;
 	wxButton* _content_earlier;
 	wxButton* _content_later;
 	wxButton* _content_timeline;
 	wxCheckBox* _sequence_video;
 	wxButton* _edit_dci_button;
-	wxChoice* _ratio;
-	wxStaticText* _ratio_description;
-	wxStaticText* _scaling_description;
-	wxSpinCtrl* _left_crop;
-	wxSpinCtrl* _right_crop;
-	wxSpinCtrl* _top_crop;
-	wxSpinCtrl* _bottom_crop;
-	wxStaticText* _filters;
-	wxButton* _filters_button;
 	wxChoice* _scaler;
  	wxSpinCtrl* _j2k_bandwidth;
 	wxChoice* _dcp_content_type;
-	wxChoice* _dcp_frame_rate;
-	wxSpinCtrl* _dcp_audio_channels;
-	wxButton* _best_dcp_frame_rate;
-	wxChoice* _dcp_resolution;
+	wxChoice* _frame_rate;
+	wxSpinCtrl* _audio_channels;
+	wxButton* _best_frame_rate;
+	wxCheckBox* _three_d;
+	wxChoice* _resolution;
+	wxChoice* _standard;
+	wxCheckBox* _encrypted;
 
 	ContentMenu _menu;