Move luminance to Interop/SMPTE metadata and remove the ISDCF metadata dialogue.

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

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 7a7d138971b8cd1e5c5c3085f53c1e9d9bce1f37..a076e4bb4eabd9acca21b31e1106825cb8881c0d 100644 (file)
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,9 +18,10 @@
 
 */
 
+
 #include "lib/config.h"
-#include <boost/shared_ptr.hpp>
-#include <boost/noncopyable.hpp>
+#include "lib/film.h"
+
 
 class wxNotebook;
 class wxPanel;
@@ -36,20 +37,24 @@ class wxGridBagSizer;
 
 class AudioDialog;
 class MarkersDialog;
-class MetadataDialog;
+class InteropMetadataDialog;
+class SMPTEMetadataDialog;
 class Film;
 class FilmViewer;
 class Ratio;
 
-class DCPPanel : public boost::noncopyable
+class DCPPanel
 {
 public:
-       DCPPanel (wxNotebook *, boost::shared_ptr<Film>, boost::weak_ptr<FilmViewer> viewer);
+       DCPPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+
+       DCPPanel (DCPPanel const&) = delete;
+       DCPPanel& operator= (DCPPanel const&) = delete;
 
-       void set_film (boost::shared_ptr<Film>);
+       void set_film (std::shared_ptr<Film>);
        void set_general_sensitivity (bool);
 
-       void film_changed (int);
+       void film_changed (Film::Property);
        void film_content_changed (int);
 
        wxPanel* panel () const {
@@ -59,7 +64,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 ();
@@ -113,7 +117,6 @@ private:
        wxStaticText* _container_label;
        wxChoice* _container;
        wxStaticText* _container_size;
-       wxButton* _edit_isdcf_button;
        wxButton* _copy_isdcf_name_button;
        wxStaticText* _j2k_bandwidth_label;
        wxStaticText* _mbits_label;
@@ -148,9 +151,10 @@ private:
 
        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;
 };