X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.h;h=c2d064ca202bc1d3305c52182b35092ecaa088e1;hb=aabf54736d7401437af7f066c51fee91be64e809;hp=6fb8973bfeb5c33c8b6926045a099b66a329449e;hpb=068bb5b95652c022419c64f3d29cc42c4610ae93;p=dcpomatic.git diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h index 6fb8973bf..c2d064ca2 100644 --- a/src/wx/film_editor.h +++ b/src/wx/film_editor.h @@ -25,10 +25,12 @@ #include #include #include -#include "lib/trim_action.h" +#include #include "lib/film.h" +class wxNotebook; class Film; +class AudioDialog; /** @class FilmEditor * @brief A wx widget to edit a film's metadata, and perform various functions. @@ -36,14 +38,20 @@ class Film; class FilmEditor : public wxPanel { public: - FilmEditor (Film *, wxWindow *); + FilmEditor (boost::shared_ptr, wxWindow *); - void set_film (Film *); + void set_film (boost::shared_ptr); void setup_visibility (); - sigc::signal1 FileChanged; + boost::signals2::signal 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 &); @@ -53,46 +61,80 @@ private: 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 trim_start_changed (wxCommandEvent &); + void trim_end_changed (wxCommandEvent &); + void trim_type_changed (wxCommandEvent &); void dcp_content_type_changed (wxCommandEvent &); void dcp_ab_toggled (wxCommandEvent &); void scaler_changed (wxCommandEvent &); void audio_gain_changed (wxCommandEvent &); void audio_gain_calculate_button_clicked (wxCommandEvent &); + void show_audio_clicked (wxCommandEvent &); void audio_delay_changed (wxCommandEvent &); 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 still_duration_changed (wxCommandEvent &); + void audio_stream_changed (wxCommandEvent &); + void subtitle_stream_changed (wxCommandEvent &); + void use_audio_changed (wxCommandEvent &); + void external_audio_changed (wxCommandEvent &); + void dcp_frame_rate_changed (wxCommandEvent &); + void best_dcp_frame_rate_clicked (wxCommandEvent &); + void pad_with_silence_toggled (wxCommandEvent &); + void minimum_audio_channels_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 (); + void setup_dcp_name (); + void setup_show_audio_sensitivity (); + void setup_scaling_description (); + void setup_notebook_size (); + void setup_frame_rate_description (); + void setup_minimum_audio_channels (); 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; /** The Film's name */ wxTextCtrl* _name; wxStaticText* _dcp_name; wxCheckBox* _use_dci_name; wxButton* _edit_dci_button; /** The Film's format */ - wxComboBox* _format; + wxChoice* _format; + wxStaticText* _scaling_description; /** The Film's content file */ wxFilePickerCtrl* _content; + wxCheckBox* _trust_content_header; /** The Film's left crop */ wxSpinCtrl* _left_crop; /** The Film's right crop */ @@ -106,22 +148,33 @@ private: /** Button to open the filters dialogue */ wxButton* _filters_button; /** The Film's scaler */ - wxComboBox* _scaler; + wxChoice* _scaler; + wxRadioButton* _use_content_audio; + wxChoice* _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 */ wxButton* _audio_gain_calculate_button; + wxButton* _show_audio; /** The Film's audio delay */ wxSpinCtrl* _audio_delay; wxCheckBox* _with_subtitles; + wxChoice* _subtitle_stream; wxSpinCtrl* _subtitle_offset; wxSpinCtrl* _subtitle_scale; + wxChoice* _colour_lut; + wxSpinCtrl* _j2k_bandwidth; /** The Film's DCP content type */ - wxComboBox* _dcp_content_type; - /** The Film's frames per second */ - wxStaticText* _frames_per_second; - /** The Film's original size */ - wxStaticText* _original_size; + wxChoice* _dcp_content_type; + /** The Film's source frame rate */ + wxStaticText* _source_frame_rate; + wxChoice* _dcp_frame_rate; + wxButton* _best_dcp_frame_rate; + wxCheckBox* _pad_with_silence; + wxSpinCtrl* _minimum_audio_channels; + wxStaticText* _frame_rate_description; /** The Film's length */ wxStaticText* _length; /** The Film's audio details */ @@ -129,10 +182,9 @@ 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* _trim_start; + wxSpinCtrl* _trim_end; + wxChoice* _trim_type; /** Selector to generate an A/B comparison DCP */ wxCheckBox* _dcp_ab; @@ -141,5 +193,6 @@ private: std::vector _formats; - wxSizer* _sizer; + bool _generally_sensitive; + AudioDialog* _audio_dialog; };