X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=31d58e1f88ed527c188476a67e7ff346e9cc84f3;hb=fecfda4c913da3f60ab4329d1f4f412bc27d19a7;hp=9da7a692989074821dacd99114e9d5071ea99b65;hpb=ddd767fd647b2fd585d75ada000d3d01c4c43cb2;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 9da7a6929..31d58e1f8 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2022 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -37,18 +37,18 @@ class wxSizer;
 class wxGridBagSizer;
 
 class AudioDialog;
-class MarkersDialog;
-class InteropMetadataDialog;
-class SMPTEMetadataDialog;
+class Choice;
 class Film;
 class FilmViewer;
+class InteropMetadataDialog;
+class MarkersDialog;
 class Ratio;
-
+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;
@@ -88,6 +88,7 @@ private:
 	void reencode_j2k_changed ();
 	void enable_audio_language_toggled ();
 	void edit_audio_language_clicked ();
+	void audio_sample_rate_changed ();
 
 	void setup_frame_rate_widget ();
 	void setup_container ();
@@ -122,33 +123,35 @@ private:
 	wxStaticText* _audio_language = nullptr;
 	Button* _edit_audio_language = nullptr;
 	wxStaticText* _container_label;
-	wxChoice* _container;
+	Choice* _container;
 	wxStaticText* _container_size;
 	wxButton* _copy_isdcf_name_button;
 	wxStaticText* _j2k_bandwidth_label;
 	wxStaticText* _mbits_label;
  	wxSpinCtrl* _j2k_bandwidth;
 	wxStaticText* _dcp_content_type_label;
-	wxChoice* _dcp_content_type;
+	Choice* _dcp_content_type;
 	wxStaticText* _frame_rate_label;
-	wxChoice* _frame_rate_choice;
+	Choice* _frame_rate_choice;
 	wxSpinCtrl* _frame_rate_spin;
 	wxSizer* _frame_rate_sizer;
 	wxStaticText* _channels_label;
-	wxChoice* _audio_channels;
+	Choice* _audio_channels;
+	wxStaticText* _audio_sample_rate_label = nullptr;
+	wxChoice* _audio_sample_rate = nullptr;
 	wxStaticText* _processor_label;
-	wxChoice* _audio_processor;
+	Choice* _audio_processor;
 	wxButton* _show_audio;
 	wxButton* _best_frame_rate;
 	wxCheckBox* _three_d;
 	wxCheckBox* _reencode_j2k;
 	wxStaticText* _resolution_label;
-	wxChoice* _resolution;
+	Choice* _resolution;
 	wxStaticText* _standard_label;
-	wxChoice* _standard;
+	Choice* _standard;
 	wxCheckBox* _encrypted;
 	wxStaticText* _reels_label;
-	wxChoice* _reel_type;
+	Choice* _reel_type;
 	wxStaticText* _reel_length_label;
 	wxStaticText* _reel_length_gb_label;
 	wxSpinCtrl* _reel_length;
@@ -162,6 +165,6 @@ private:
 	SMPTEMetadataDialog* _smpte_metadata_dialog = nullptr;
 
 	std::shared_ptr<Film> _film;
-	std::weak_ptr<FilmViewer> _viewer;
+	FilmViewer& _viewer;
 	bool _generally_sensitive;
 };