Changes to libdcp.

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

diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 1fcc8d5641085a4e2f2b99e31848e3afd294c3db..cf8d3da180dc14ab247911cd69ae1b3117ef69d7 100644 (file)
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -19,31 +19,30 @@
 
 #include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
-#include <libdcp/certificates.h>
+#include <dcp/certificate.h>
+#include "table_dialog.h"
 
 class Progress;
 
-class ScreenDialog : public wxDialog
+class ScreenDialog : public TableDialog
 {
 public:
-       ScreenDialog (wxWindow *, std::string, std::string name = "", boost::shared_ptr<libdcp::Certificate> c = boost::shared_ptr<libdcp::Certificate> ());
+       ScreenDialog (wxWindow *, std::string, std::string name = "", boost::optional<dcp::Certificate> c = boost::optional<dcp::Certificate> ());
 
        std::string name () const;
-       boost::shared_ptr<libdcp::Certificate> certificate () const;
-       
+       boost::optional<dcp::Certificate> certificate () const;
+
 private:
        void select_certificate ();
        void load_certificate (boost::filesystem::path);
        void download_certificate ();
        void setup_sensitivity ();
-       
+
        wxTextCtrl* _name;
        wxChoice* _manufacturer;
-       wxTextCtrl* _serial;
-       Progress* _progress;
        wxButton* _load_certificate;
        wxButton* _download_certificate;
        wxTextCtrl* _certificate_text;
 
-       boost::shared_ptr<libdcp::Certificate> _certificate;
+       boost::optional<dcp::Certificate> _certificate;
 };