Merge master.

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

diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index b702ae0ad8188be5892108c5b8ebef9afee3157e..0d46a46ec215dfc5f7de8cdaf89821d955bf3fe2 100644 (file)
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -19,7 +19,7 @@
 
 #include <wx/filepicker.h>
 #include <wx/validate.h>
-#include <libdcp/exceptions.h>
+#include <dcp/exceptions.h>
 #include "lib/compose.hpp"
 #include "lib/util.h"
 #include "screen_dialog.h"
@@ -31,7 +31,7 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 
-ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr<libdcp::Certificate> certificate)
+ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr<dcp::Certificate> certificate)
        : TableDialog (parent, std_to_wx (title), 2, true)
        , _certificate (certificate)
 {
@@ -79,7 +79,7 @@ ScreenDialog::name () const
        return wx_to_std (_name->GetValue());
 }
 
-shared_ptr<libdcp::Certificate>
+shared_ptr<dcp::Certificate>
 ScreenDialog::certificate () const
 {
        return _certificate;
@@ -89,9 +89,9 @@ void
 ScreenDialog::load_certificate (boost::filesystem::path file)
 {
        try {
-               _certificate.reset (new libdcp::Certificate (file));
+               _certificate.reset (new dcp::Certificate (file));
                _certificate_text->SetValue (_certificate->certificate ());
-       } catch (libdcp::MiscError& e) {
+       } catch (dcp::MiscError& e) {
                error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
        }
 }
@@ -128,7 +128,7 @@ void
 ScreenDialog::setup_sensitivity ()
 {
        wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
-       ok->Enable (_certificate);
+       ok->Enable (_certificate.get ());
 
        _download_certificate->Enable (
                _manufacturer->GetStringSelection() == _("Doremi") ||