std::shared_ptr

[dcpomatic.git] / src / wx / dcp_panel.h

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index f717e83273c2219285ecfbc8b10441004ceb3bb6..cce97a2dc314ee9b743fb3386a9721c43d45ede0 100644 (file)
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -19,7 +19,6 @@
 */
 
 #include "lib/config.h"
-#include <boost/shared_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
 class wxNotebook;
@@ -36,7 +35,8 @@ class wxGridBagSizer;
 
 class AudioDialog;
 class MarkersDialog;
-class MetadataDialog;
+class InteropMetadataDialog;
+class SMPTEMetadataDialog;
 class Film;
 class FilmViewer;
 class Ratio;
@@ -44,9 +44,9 @@ class Ratio;
 class DCPPanel : public boost::noncopyable
 {
 public:
-       DCPPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+       DCPPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
 
-       void set_film (boost::shared_ptr<Film>);
+       void set_film (std::shared_ptr<Film>);
        void set_general_sensitivity (bool);
 
        void film_changed (int);
@@ -72,14 +72,11 @@ private:
        void resolution_changed ();
        void three_d_changed ();
        void standard_changed ();
-       void signed_toggled ();
        void encrypted_toggled ();
-       void edit_key_clicked ();
        void audio_processor_changed ();
        void show_audio_clicked ();
        void reel_type_changed ();
        void reel_length_changed ();
-       void upload_after_make_dcp_changed ();
        void markers_clicked ();
        void metadata_clicked ();
        void reencode_j2k_changed ();
@@ -90,6 +87,7 @@ private:
        void add_to_grid ();
        void add_video_panel_to_grid ();
        void add_audio_panel_to_grid ();
+       void add_audio_processors ();
 
        int minimum_allowed_audio_channels () const;
 
@@ -138,25 +136,22 @@ private:
        wxChoice* _resolution;
        wxStaticText* _standard_label;
        wxChoice* _standard;
-       wxCheckBox* _signed;
        wxCheckBox* _encrypted;
-       wxStaticText* _key_label;
-       wxStaticText* _key;
-       wxButton* _edit_key;
        wxStaticText* _reels_label;
        wxChoice* _reel_type;
        wxStaticText* _reel_length_label;
        wxStaticText* _reel_length_gb_label;
        wxSpinCtrl* _reel_length;
-       wxCheckBox* _upload_after_make_dcp;
        wxButton* _markers;
        wxButton* _metadata;
+       wxSizer* _audio_panel_sizer;
 
        AudioDialog* _audio_dialog;
        MarkersDialog* _markers_dialog;
-       MetadataDialog* _metadata_dialog;
+       InteropMetadataDialog* _interop_metadata_dialog;
+       SMPTEMetadataDialog* _smpte_metadata_dialog;
 
-       boost::shared_ptr<Film> _film;
-       boost::weak_ptr<FilmViewer> _viewer;
+       std::shared_ptr<Film> _film;
+       std::weak_ptr<FilmViewer> _viewer;
        bool _generally_sensitive;
 };