X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=849fe185cf836bc588428c9308dd928db014226b;hb=HEAD;hp=470f98fc8b54afbd1bac1f2b0d4fa6983d107ccb;hpb=d9b398b33716d5f28fd8d6e22cb723c2fbb635a0;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 470f98fc8..849fe185c 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -19,17 +19,18 @@
 */
 
 
+#include "wx_ptr.h"
 #include "lib/config.h"
-#include "lib/film.h"
+#include "lib/film_property.h"
 
 
 class Button;
+class CheckBox;
 class wxNotebook;
 class wxPanel;
 class wxBoxSizer;
 class wxTextCtrl;
 class wxStaticText;
-class wxCheckBox;
 class wxChoice;
 class wxButton;
 class wxSpinCtrl;
@@ -48,7 +49,7 @@ class SMPTEMetadataDialog;
 class DCPPanel
 {
 public:
-	DCPPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+	DCPPanel(wxNotebook *, std::shared_ptr<Film>, FilmViewer& viewer);
 
 	DCPPanel (DCPPanel const&) = delete;
 	DCPPanel& operator= (DCPPanel const&) = delete;
@@ -56,7 +57,7 @@ public:
 	void set_film (std::shared_ptr<Film>);
 	void set_general_sensitivity (bool);
 
-	void film_changed (Film::Property);
+	void film_changed(FilmProperty);
 	void film_content_changed (int);
 
 	wxPanel* panel () const {
@@ -97,6 +98,8 @@ private:
 	void add_video_panel_to_grid ();
 	void add_audio_panel_to_grid ();
 	void add_audio_processors ();
+	void add_standards();
+	void set_standard();
 
 	int minimum_allowed_audio_channels () const;
 
@@ -118,8 +121,8 @@ private:
 	wxStaticText* _name_label;
 	wxTextCtrl* _name;
 	wxStaticText* _dcp_name;
-	wxCheckBox* _use_isdcf_name;
-	wxCheckBox* _enable_audio_language = nullptr;
+	CheckBox* _use_isdcf_name;
+	CheckBox* _enable_audio_language = nullptr;
 	wxStaticText* _audio_language = nullptr;
 	Button* _edit_audio_language = nullptr;
 	wxStaticText* _container_label;
@@ -143,13 +146,13 @@ private:
 	Choice* _audio_processor;
 	wxButton* _show_audio;
 	wxButton* _best_frame_rate;
-	wxCheckBox* _three_d;
-	wxCheckBox* _reencode_j2k;
+	CheckBox* _three_d;
+	CheckBox* _reencode_j2k;
 	wxStaticText* _resolution_label;
 	Choice* _resolution;
 	wxStaticText* _standard_label;
 	Choice* _standard;
-	wxCheckBox* _encrypted;
+	CheckBox* _encrypted;
 	wxStaticText* _reels_label;
 	Choice* _reel_type;
 	wxStaticText* _reel_length_label;
@@ -159,12 +162,12 @@ private:
 	wxButton* _metadata;
 	wxSizer* _audio_panel_sizer;
 
-	AudioDialog* _audio_dialog = nullptr;
-	MarkersDialog* _markers_dialog = nullptr;
-	InteropMetadataDialog* _interop_metadata_dialog = nullptr;
-	SMPTEMetadataDialog* _smpte_metadata_dialog = nullptr;
+	wx_ptr<AudioDialog> _audio_dialog;
+	wx_ptr<MarkersDialog> _markers_dialog;
+	wx_ptr<InteropMetadataDialog> _interop_metadata_dialog;
+	wx_ptr<SMPTEMetadataDialog> _smpte_metadata_dialog;
 
 	std::shared_ptr<Film> _film;
-	std::weak_ptr<FilmViewer> _viewer;
+	FilmViewer& _viewer;
 	bool _generally_sensitive;
 };