projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
screen_dialog.cc
diff --git
a/src/wx/screen_dialog.cc
b/src/wx/screen_dialog.cc
index c6991271675f3321e82886478fbad2a879bff1ea..503745683980f3b2a860ec09050c2b80bba01a84 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 <wx/filepicker.h>
#include <wx/validate.h>
-#include <
lib
dcp/exceptions.h>
+#include <dcp/exceptions.h>
#include "lib/compose.hpp"
#include "lib/util.h"
#include "screen_dialog.h"
#include "lib/compose.hpp"
#include "lib/util.h"
#include "screen_dialog.h"
@@
-29,9
+29,9
@@
using std::string;
using std::cout;
using std::string;
using std::cout;
-using boost::
shared_ptr
;
+using boost::
optional
;
-ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name,
shared_ptr<lib
dcp::Certificate> certificate)
+ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name,
optional<
dcp::Certificate> certificate)
: TableDialog (parent, std_to_wx (title), 2, true)
, _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());
}
return wx_to_std (_name->GetValue());
}
-
shared_ptr<lib
dcp::Certificate>
+
optional<
dcp::Certificate>
ScreenDialog::certificate () const
{
return _certificate;
ScreenDialog::certificate () const
{
return _certificate;
@@
-89,9
+89,9
@@
void
ScreenDialog::load_certificate (boost::filesystem::path file)
{
try {
ScreenDialog::load_certificate (boost::filesystem::path file)
{
try {
- _certificate
.reset (new libdcp::Certificate
(file));
+ _certificate
= dcp::Certificate (dcp::file_to_string
(file));
_certificate_text->SetValue (_certificate->certificate ());
_certificate_text->SetValue (_certificate->certificate ());
- } catch (
lib
dcp::MiscError& e) {
+ } catch (dcp::MiscError& e) {
error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what()));
}
}
error_dialog (this, wxString::Format (_("Could not read certificate file (%s)"), e.what()));
}
}