X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=7e75b4bf00841fbcd766778471a989f7f81ec425;hb=0b781dd65a90e617866810ecb3dee27267449f1f;hp=720e71902c9c4b804e6d9b15a498ca46a7466c98;hpb=d382f34db155ddaf4bb61538c18b87c7564e00b2;p=dcpomatic.git

diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 720e71902..7e75b4bf0 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -24,9 +24,12 @@
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
 #include <wx/filepicker.h>
-#include "lib/trim_action.h"
+#include <wx/collpane.h>
+#include <boost/signals2.hpp>
 #include "lib/film.h"
 
+class wxNotebook;
+
 class Film;
 
 /** @class FilmEditor
@@ -35,23 +38,33 @@ class Film;
 class FilmEditor : public wxPanel
 {
 public:
-	FilmEditor (Film *, wxWindow *);
+	FilmEditor (boost::shared_ptr<Film>, wxWindow *);
 
-	void set_film (Film *);
+	void set_film (boost::shared_ptr<Film>);
 	void setup_visibility ();
 
-	sigc::signal1<void, std::string> FileChanged;
+	boost::signals2::signal<void (std::string)> FileChanged;
 
 private:
+	void make_film_panel ();
+	void make_video_panel ();
+	void make_audio_panel ();
+	void make_subtitle_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 content_changed (wxCommandEvent &);
+	void trust_content_header_changed (wxCommandEvent &);
 	void format_changed (wxCommandEvent &);
-	void dcp_range_changed (int, TrimAction);
+	void dcp_trim_start_changed (wxCommandEvent &);
+	void dcp_trim_end_changed (wxCommandEvent &);
 	void dcp_content_type_changed (wxCommandEvent &);
 	void dcp_ab_toggled (wxCommandEvent &);
 	void scaler_changed (wxCommandEvent &);
@@ -59,32 +72,54 @@ private:
 	void audio_gain_calculate_button_clicked (wxCommandEvent &);
 	void audio_delay_changed (wxCommandEvent &);
 	void with_subtitles_toggled (wxCommandEvent &);
+	void subtitle_offset_changed (wxCommandEvent &);
+	void subtitle_scale_changed (wxCommandEvent &);
 	void still_duration_changed (wxCommandEvent &);
+	void audio_stream_changed (wxCommandEvent &);
+	void subtitle_stream_changed (wxCommandEvent &);
+	void use_audio_changed (wxCommandEvent &);
+	void external_audio_changed (wxCommandEvent &);
 
 	/* Handle changes to the model */
 	void film_changed (Film::Property);
 
 	/* Button clicks */
 	void edit_filters_clicked (wxCommandEvent &);
-	void change_dcp_range_clicked (wxCommandEvent &);
 
 	void set_things_sensitive (bool);
 	void setup_formats ();
-	void setup_subtitle_button ();
+	void setup_subtitle_control_sensitivity ();
+	void setup_audio_control_sensitivity ();
+	void setup_streams ();
+	void setup_audio_details ();
 	
 	wxControl* video_control (wxControl *);
 	wxControl* still_control (wxControl *);
 
-	Film::Property _ignore_changes;
+	void active_jobs_changed (bool);
+
+	wxNotebook* _notebook;
+	wxPanel* _film_panel;
+	wxSizer* _film_sizer;
+	wxPanel* _video_panel;
+	wxSizer* _video_sizer;
+	wxPanel* _audio_panel;
+	wxSizer* _audio_sizer;
+	wxPanel* _subtitle_panel;
+	wxSizer* _subtitle_sizer;
 
 	/** The film we are editing */
-	Film* _film;
+	boost::shared_ptr<Film> _film;
 	/** The Film's name */
 	wxTextCtrl* _name;
+	wxStaticText* _dcp_name;
+	wxCheckBox* _use_dci_name;
+	wxButton* _edit_dci_button;
 	/** The Film's format */
 	wxComboBox* _format;
 	/** The Film's content file */
 	wxFilePickerCtrl* _content;
+	wxCheckBox* _trust_content_header;
 	/** The Film's left crop */
 	wxSpinCtrl* _left_crop;
 	/** The Film's right crop */
@@ -99,6 +134,10 @@ private:
 	wxButton* _filters_button;
 	/** The Film's scaler */
 	wxComboBox* _scaler;
+	wxRadioButton* _use_content_audio;
+	wxComboBox* _audio_stream;
+	wxRadioButton* _use_external_audio;
+	wxFilePickerCtrl* _external_audio[MAX_AUDIO_CHANNELS];
 	/** The Film's audio gain */
 	wxSpinCtrl* _audio_gain;
 	/** A button to open the gain calculation dialogue */
@@ -106,6 +145,9 @@ private:
 	/** The Film's audio delay */
 	wxSpinCtrl* _audio_delay;
 	wxCheckBox* _with_subtitles;
+	wxComboBox* _subtitle_stream;
+	wxSpinCtrl* _subtitle_offset;
+	wxSpinCtrl* _subtitle_scale;
 	/** The Film's DCP content type */
 	wxComboBox* _dcp_content_type;
 	/** The Film's frames per second */
@@ -119,10 +161,8 @@ private:
 	/** The Film's duration for still sources */
 	wxSpinCtrl* _still_duration;
 
-	/** Display of the range of frames that will be used */
-	wxStaticText* _dcp_range;
-	/** Button to change the range */
-	wxButton* _change_dcp_range_button;
+	wxSpinCtrl* _dcp_trim_start;
+	wxSpinCtrl* _dcp_trim_end;
 	/** Selector to generate an A/B comparison DCP */
 	wxCheckBox* _dcp_ab;
 
@@ -131,5 +171,5 @@ private:
 
 	std::vector<Format const *> _formats;
 
-	wxSizer* _sizer;
+	bool _generally_sensitive;
 };