X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=9da7a692989074821dacd99114e9d5071ea99b65;hb=b5632b00565286feed6b3efa1c1b4b19b1b0f164;hp=cce97a2dc314ee9b743fb3386a9721c43d45ede0;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h index cce97a2dc..9da7a6929 100644 --- a/src/wx/dcp_panel.h +++ b/src/wx/dcp_panel.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2019 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,9 +18,12 @@ */ + #include "lib/config.h" -#include +#include "lib/film.h" + +class Button; class wxNotebook; class wxPanel; class wxBoxSizer; @@ -41,15 +44,19 @@ class Film; class FilmViewer; class Ratio; -class DCPPanel : public boost::noncopyable + +class DCPPanel { public: DCPPanel (wxNotebook *, std::shared_ptr, std::weak_ptr viewer); + DCPPanel (DCPPanel const&) = delete; + DCPPanel& operator= (DCPPanel const&) = delete; + void set_film (std::shared_ptr); void set_general_sensitivity (bool); - void film_changed (int); + void film_changed (Film::Property); void film_content_changed (int); wxPanel* panel () const { @@ -59,7 +66,6 @@ public: private: void name_changed (); void use_isdcf_name_toggled (); - void edit_isdcf_button_clicked (); void copy_isdcf_name_button_clicked (); void container_changed (); void dcp_content_type_changed (); @@ -80,6 +86,8 @@ private: void markers_clicked (); void metadata_clicked (); void reencode_j2k_changed (); + void enable_audio_language_toggled (); + void edit_audio_language_clicked (); void setup_frame_rate_widget (); void setup_container (); @@ -110,10 +118,12 @@ private: wxTextCtrl* _name; wxStaticText* _dcp_name; wxCheckBox* _use_isdcf_name; + wxCheckBox* _enable_audio_language = nullptr; + wxStaticText* _audio_language = nullptr; + Button* _edit_audio_language = nullptr; wxStaticText* _container_label; wxChoice* _container; wxStaticText* _container_size; - wxButton* _edit_isdcf_button; wxButton* _copy_isdcf_name_button; wxStaticText* _j2k_bandwidth_label; wxStaticText* _mbits_label; @@ -146,10 +156,10 @@ private: wxButton* _metadata; wxSizer* _audio_panel_sizer; - AudioDialog* _audio_dialog; - MarkersDialog* _markers_dialog; - InteropMetadataDialog* _interop_metadata_dialog; - SMPTEMetadataDialog* _smpte_metadata_dialog; + AudioDialog* _audio_dialog = nullptr; + MarkersDialog* _markers_dialog = nullptr; + InteropMetadataDialog* _interop_metadata_dialog = nullptr; + SMPTEMetadataDialog* _smpte_metadata_dialog = nullptr; std::shared_ptr _film; std::weak_ptr _viewer;