projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
94b63f7
)
Rename certificate -> recipient in Screen.
author
Carl Hetherington
<cth@carlh.net>
Sun, 15 Nov 2015 01:17:12 +0000
(
01:17
+0000)
committer
Carl Hetherington
<cth@carlh.net>
Sun, 15 Nov 2015 01:17:12 +0000
(
01:17
+0000)
src/lib/film.cc
patch
|
blob
|
history
src/lib/screen.cc
patch
|
blob
|
history
src/lib/screen.h
patch
|
blob
|
history
src/tools/dcpomatic_kdm.cc
patch
|
blob
|
history
src/wx/screens_panel.cc
patch
|
blob
|
history
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index 4691925bce3b12d0dfb8650c07c0037baae64dd0..d406152a19a494a865401979baa0e9e13eed749a 100644
(file)
--- a/
src/lib/film.cc
+++ b/
src/lib/film.cc
@@
-1143,8
+1143,8
@@
Film::make_kdms (
list<ScreenKDM> kdms;
BOOST_FOREACH (shared_ptr<Screen> i, screens) {
list<ScreenKDM> kdms;
BOOST_FOREACH (shared_ptr<Screen> i, screens) {
- if (i->
certificate
) {
- kdms.push_back (ScreenKDM (i, make_kdm (i->
certificate
.get(), dcp, from, until, formulation)));
+ if (i->
recipient
) {
+ kdms.push_back (ScreenKDM (i, make_kdm (i->
recipient
.get(), dcp, from, until, formulation)));
}
}
}
}
diff --git
a/src/lib/screen.cc
b/src/lib/screen.cc
index 347e1d655a76aae7fc954bb4d7b69e7ec344b488..0876e770b03b4cd43b86d8d4892f11f45ec4a718 100644
(file)
--- a/
src/lib/screen.cc
+++ b/
src/lib/screen.cc
@@
-24,7
+24,9
@@
Screen::Screen (cxml::ConstNodePtr node)
: name (node->string_child ("Name"))
{
if (node->optional_string_child ("Certificate")) {
: name (node->string_child ("Name"))
{
if (node->optional_string_child ("Certificate")) {
- certificate = dcp::Certificate (node->string_child ("Certificate"));
+ recipient = dcp::Certificate (node->string_child ("Certificate"));
+ } else if (node->optional_string_child ("Recipient")) {
+ recipient = dcp::Certificate (node->string_child ("Recipient"));
}
}
}
}
@@
-32,7
+34,7
@@
void
Screen::as_xml (xmlpp::Element* parent) const
{
parent->add_child("Name")->add_child_text (name);
Screen::as_xml (xmlpp::Element* parent) const
{
parent->add_child("Name")->add_child_text (name);
- if (
certificate
) {
- parent->add_child("
Certificate")->add_child_text (certificate
->certificate (true));
+ if (
recipient
) {
+ parent->add_child("
Recipient")->add_child_text (recipient
->certificate (true));
}
}
}
}
diff --git
a/src/lib/screen.h
b/src/lib/screen.h
index 6bac3ec14f12186b567324e34665c8283f4cee29..6e3b8b01dc32b0342100b80de96e900e355587cb 100644
(file)
--- a/
src/lib/screen.h
+++ b/
src/lib/screen.h
@@
-28,14
+28,14
@@
class Cinema;
* @brief A representation of a Screen for KDM generation.
*
* This is the name of the screen and the certificate of its
* @brief A representation of a Screen for KDM generation.
*
* This is the name of the screen and the certificate of its
- *
server
.
+ *
`recipient' (i.e. the servers)
.
*/
class Screen
{
public:
*/
class Screen
{
public:
- Screen (std::string const & n, boost::optional<dcp::Certificate>
cert
)
+ Screen (std::string const & n, boost::optional<dcp::Certificate>
rec
)
: name (n)
: name (n)
- ,
certificate (cert
)
+ ,
recipient (rec
)
{}
Screen (cxml::ConstNodePtr);
{}
Screen (cxml::ConstNodePtr);
@@
-44,5
+44,5
@@
public:
boost::shared_ptr<Cinema> cinema;
std::string name;
boost::shared_ptr<Cinema> cinema;
std::string name;
- boost::optional<dcp::Certificate>
certificate
;
+ boost::optional<dcp::Certificate>
recipient
;
};
};
diff --git
a/src/tools/dcpomatic_kdm.cc
b/src/tools/dcpomatic_kdm.cc
index 6190f1416b9eeb76c66a5870c639338c0db9f84d..2c96f37b25be1a849bdf5ab3382220ca8829bd84 100644
(file)
--- a/
src/tools/dcpomatic_kdm.cc
+++ b/
src/tools/dcpomatic_kdm.cc
@@
-264,7
+264,7
@@
private:
list<ScreenKDM> screen_kdms;
BOOST_FOREACH (shared_ptr<Screen> i, _screens->screens()) {
list<ScreenKDM> screen_kdms;
BOOST_FOREACH (shared_ptr<Screen> i, _screens->screens()) {
- if (!i->
certificate
) {
+ if (!i->
recipient
) {
continue;
}
continue;
}
@@
-279,7
+279,7
@@
private:
}
/* Encrypt */
}
/* Encrypt */
- screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->
certificate
.get(), _output->formulation())));
+ screen_kdms.push_back (ScreenKDM (i, kdm.encrypt (signer, i->
recipient
.get(), _output->formulation())));
}
if (_output->write_to()) {
}
if (_output->write_to()) {
diff --git
a/src/wx/screens_panel.cc
b/src/wx/screens_panel.cc
index 4f8e3ad4da21956e909099e2d9d5fc131381c881..2d47b65b55cea9129c3aaaeaf552e9017a1959ad 100644
(file)
--- a/
src/wx/screens_panel.cc
+++ b/
src/wx/screens_panel.cc
@@
-244,10
+244,10
@@
ScreensPanel::edit_screen_clicked ()
pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
- ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->
certificate
);
+ ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->
recipient
);
if (d->ShowModal () == wxID_OK) {
s.second->name = d->name ();
if (d->ShowModal () == wxID_OK) {
s.second->name = d->name ();
- s.second->
certificate
= d->certificate ();
+ s.second->
recipient
= d->certificate ();
_targets->SetItemText (s.first, std_to_wx (d->name()));
Config::instance()->changed ();
}
_targets->SetItemText (s.first, std_to_wx (d->name()));
Config::instance()->changed ();
}