projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0ab8cf5
)
Write 'f', 'b' and 'e' tags into all KDMWithMetadata when they are made.
author
Carl Hetherington
<cth@carlh.net>
Tue, 5 May 2020 13:08:50 +0000
(15:08 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 6 May 2020 18:15:49 +0000
(20:15 +0200)
src/tools/dcpomatic_kdm.cc
patch
|
blob
|
history
src/tools/dcpomatic_kdm_cli.cc
patch
|
blob
|
history
src/wx/kdm_dialog.cc
patch
|
blob
|
history
src/wx/kdm_output_panel.cc
patch
|
blob
|
history
src/wx/kdm_output_panel.h
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_kdm.cc
b/src/tools/dcpomatic_kdm.cc
index dd45401cb70c050c79c602c1d7a1e0a182daa680..7920f7e5756b9994c7147fd5c45bccc1fb87cd9d 100644
(file)
--- a/
src/tools/dcpomatic_kdm.cc
+++ b/
src/tools/dcpomatic_kdm.cc
@@
-317,17
+317,23
@@
private:
continue;
}
continue;
}
+ dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+ dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+
DecryptedECinemaKDM kdm (
decrypted.id(),
decrypted.name(),
decrypted.key(),
DecryptedECinemaKDM kdm (
decrypted.id(),
decrypted.name(),
decrypted.key(),
-
dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())
,
- dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())
+
begin
,
+ end
);
dcp::NameFormat::Map name_values;
name_values['c'] = i->cinema->name;
name_values['s'] = i->name;
);
dcp::NameFormat::Map name_values;
name_values['c'] = i->cinema->name;
name_values['s'] = i->name;
+ name_values['f'] = title;
+ name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
+ name_values['e'] = end.date() + " " + end.time_of_day(true, false);
/* Encrypt */
kdms.push_back (
/* Encrypt */
kdms.push_back (
@@
-358,10
+364,13
@@
private:
continue;
}
continue;
}
+ dcp::LocalTime begin(_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+ dcp::LocalTime end(_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+
/* Make an empty KDM */
dcp::DecryptedKDM kdm (
/* Make an empty KDM */
dcp::DecryptedKDM kdm (
-
dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())
,
-
dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())
,
+
begin
,
+
end
,
decrypted.annotation_text().get_value_or (""),
decrypted.content_title_text(),
dcp::LocalTime().as_string()
decrypted.annotation_text().get_value_or (""),
decrypted.content_title_text(),
dcp::LocalTime().as_string()
@@
-375,6
+384,9
@@
private:
dcp::NameFormat::Map name_values;
name_values['c'] = i->cinema->name;
name_values['s'] = i->name;
dcp::NameFormat::Map name_values;
name_values['c'] = i->cinema->name;
name_values['s'] = i->name;
+ name_values['f'] = title;
+ name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
+ name_values['e'] = end.date() + " " + end.time_of_day(true, false);
/* Encrypt */
kdms.push_back (
/* Encrypt */
kdms.push_back (
@@
-397,7
+409,7
@@
private:
}
pair<shared_ptr<Job>, int> result = _output->make (
}
pair<shared_ptr<Job>, int> result = _output->make (
- kdms, title,
_timing,
bind (&DOMFrame::confirm_overwrite, this, _1)
+ kdms, title, bind (&DOMFrame::confirm_overwrite, this, _1)
);
if (result.first) {
);
if (result.first) {
diff --git
a/src/tools/dcpomatic_kdm_cli.cc
b/src/tools/dcpomatic_kdm_cli.cc
index ec49723a8fcdf71892837da62d4d13de5fab5ae8..a85624c82cc64fab1dd83d5cfeb907e686df6231 100644
(file)
--- a/
src/tools/dcpomatic_kdm_cli.cc
+++ b/
src/tools/dcpomatic_kdm_cli.cc
@@
-223,21
+223,22
@@
from_film (
boost::filesystem::path cpl = cpls.front().cpl_file;
dcp::NameFormat::Map values;
boost::filesystem::path cpl = cpls.front().cpl_file;
dcp::NameFormat::Map values;
- values['f'] = film->name();
- values['b'] = dcp::LocalTime(valid_from).date() + " " + dcp::LocalTime(valid_from).time_of_day(true, false);
- values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
try {
list<KDMWithMetadataPtr> kdms;
BOOST_FOREACH (shared_ptr<Screen> i, screens) {
if (i->recipient) {
try {
list<KDMWithMetadataPtr> kdms;
BOOST_FOREACH (shared_ptr<Screen> i, screens) {
if (i->recipient) {
+
+ dcp::LocalTime const begin(valid_from, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0);
+ dcp::LocalTime const end(valid_to, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0);
+
dcp::EncryptedKDM const kdm = film->make_kdm (
i->recipient.get(),
i->trusted_device_thumbprints(),
cpl,
dcp::EncryptedKDM const kdm = film->make_kdm (
i->recipient.get(),
i->trusted_device_thumbprints(),
cpl,
-
dcp::LocalTime(valid_from, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0)
,
-
dcp::LocalTime(valid_to, i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0)
,
+
begin
,
+
end
,
formulation,
disable_forensic_marking_picture,
disable_forensic_marking_audio
formulation,
disable_forensic_marking_picture,
disable_forensic_marking_audio
@@
-246,6
+247,9
@@
from_film (
dcp::NameFormat::Map name_values;
name_values['c'] = i->cinema->name;
name_values['s'] = i->name;
dcp::NameFormat::Map name_values;
name_values['c'] = i->cinema->name;
name_values['s'] = i->name;
+ name_values['f'] = film->name();
+ name_values['b'] = dcp::LocalTime(begin).date() + " " + dcp::LocalTime(begin).time_of_day(true, false);
+ name_values['e'] = dcp::LocalTime(end).date() + " " + dcp::LocalTime(end).time_of_day(true, false);
kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm)));
}
kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm)));
}
@@
-343,9
+347,6
@@
from_dkdm (
)
{
dcp::NameFormat::Map values;
)
{
dcp::NameFormat::Map values;
- values['f'] = dkdm.annotation_text().get_value_or("");
- values['b'] = dcp::LocalTime(valid_from).date() + " " + dcp::LocalTime(valid_from).time_of_day(true, false);
- values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
try {
list<KDMWithMetadataPtr> kdms;
try {
list<KDMWithMetadataPtr> kdms;
@@
-354,9
+355,15
@@
from_dkdm (
continue;
}
continue;
}
+ dcp::LocalTime begin(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+ dcp::LocalTime end(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute());
+
dcp::NameFormat::Map name_values;
name_values['c'] = i->cinema->name;
name_values['s'] = i->name;
dcp::NameFormat::Map name_values;
name_values['c'] = i->cinema->name;
name_values['s'] = i->name;
+ name_values['f'] = dkdm.annotation_text().get_value_or("");
+ name_values['b'] = begin.date() + " " + begin.time_of_day(true, false);
+ name_values['e'] = end.date() + " " + end.time_of_day(true, false);
kdms.push_back (
KDMWithMetadataPtr(
kdms.push_back (
KDMWithMetadataPtr(
@@
-367,8
+374,8
@@
from_dkdm (
dkdm,
i->recipient.get(),
i->trusted_device_thumbprints(),
dkdm,
i->recipient.get(),
i->trusted_device_thumbprints(),
-
dcp::LocalTime(valid_from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())
,
-
dcp::LocalTime(valid_to, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute())
,
+
begin
,
+
end
,
formulation,
disable_forensic_marking_picture,
disable_forensic_marking_audio
formulation,
disable_forensic_marking_picture,
disable_forensic_marking_audio
diff --git
a/src/wx/kdm_dialog.cc
b/src/wx/kdm_dialog.cc
index 0686450fbf7fbf814efcb2ba6e20939217192cb9..d946e1d12f1d5ad292c4c9e4a77bfab87c487636 100644
(file)
--- a/
src/wx/kdm_dialog.cc
+++ b/
src/wx/kdm_dialog.cc
@@
-163,12
+163,15
@@
KDMDialog::make_clicked ()
BOOST_FOREACH (shared_ptr<dcpomatic::Screen> i, _screens->screens()) {
if (i->recipient) {
BOOST_FOREACH (shared_ptr<dcpomatic::Screen> i, _screens->screens()) {
if (i->recipient) {
+ dcp::LocalTime const begin(_timing->from(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0);
+ dcp::LocalTime const end(_timing->until(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0);
+
dcp::EncryptedKDM const kdm = film->make_kdm (
i->recipient.get(),
i->trusted_device_thumbprints(),
_cpl->cpl(),
dcp::EncryptedKDM const kdm = film->make_kdm (
i->recipient.get(),
i->trusted_device_thumbprints(),
_cpl->cpl(),
-
dcp::LocalTime(_timing->from(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0)
,
-
dcp::LocalTime(_timing->until(), i->cinema ? i->cinema->utc_offset_hour() : 0, i->cinema ? i->cinema->utc_offset_minute() : 0)
,
+
begin
,
+
end
,
_output->formulation(),
!_output->forensic_mark_video(),
for_audio
_output->formulation(),
!_output->forensic_mark_video(),
for_audio
@@
-179,6
+182,9
@@
KDMDialog::make_clicked ()
name_values['c'] = i->cinema->name;
}
name_values['s'] = i->name;
name_values['c'] = i->cinema->name;
}
name_values['s'] = i->name;
+ name_values['f'] = film->name();
+ name_values['b'] = dcp::LocalTime(begin).date() + " " + dcp::LocalTime(begin).time_of_day(false, false);
+ name_values['e'] = dcp::LocalTime(end).date() + " " + dcp::LocalTime(end).time_of_day(false, false);
kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm)));
}
kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm)));
}
@@
-196,7
+202,7
@@
KDMDialog::make_clicked ()
return;
}
return;
}
- pair<shared_ptr<Job>, int> result = _output->make (kdms, film->name(),
_timing,
bind (&KDMDialog::confirm_overwrite, this, _1));
+ pair<shared_ptr<Job>, int> result = _output->make (kdms, film->name(), bind (&KDMDialog::confirm_overwrite, this, _1));
if (result.first) {
JobManager::instance()->add (result.first);
}
if (result.first) {
JobManager::instance()->add (result.first);
}
diff --git
a/src/wx/kdm_output_panel.cc
b/src/wx/kdm_output_panel.cc
index 025707b287213ea813742d1609166babb2d25f3b..0a70ff125bdb10e9b0a01e22f319a81abfcd81a2 100644
(file)
--- a/
src/wx/kdm_output_panel.cc
+++ b/
src/wx/kdm_output_panel.cc
@@
-182,7
+182,7
@@
KDMOutputPanel::kdm_write_type_changed ()
pair<shared_ptr<Job>, int>
KDMOutputPanel::make (
pair<shared_ptr<Job>, int>
KDMOutputPanel::make (
- list<KDMWithMetadataPtr> kdms, string name,
KDMTimingPanel* timing,
function<bool (boost::filesystem::path)> confirm_overwrite
+ list<KDMWithMetadataPtr> kdms, string name, function<bool (boost::filesystem::path)> confirm_overwrite
)
{
list<list<KDMWithMetadataPtr> > const cinema_kdms = collect (kdms);
)
{
list<list<KDMWithMetadataPtr> > const cinema_kdms = collect (kdms);
@@
-240,9
+240,6
@@
KDMOutputPanel::make (
try {
dcp::NameFormat::Map name_values;
try {
dcp::NameFormat::Map name_values;
- name_values['f'] = name;
- name_values['b'] = dcp::LocalTime(timing->from()).date() + " " + dcp::LocalTime(timing->from()).time_of_day(false, false);
- name_values['e'] = dcp::LocalTime(timing->until()).date() + " " + dcp::LocalTime(timing->until()).time_of_day(false, false);
if (_write_to->GetValue()) {
if (_write_flat->GetValue()) {
if (_write_to->GetValue()) {
if (_write_flat->GetValue()) {
diff --git
a/src/wx/kdm_output_panel.h
b/src/wx/kdm_output_panel.h
index fbfc1205ebcea73c90d1a3a15e9eb2619aa5245c..0281b26d0d8253ab2d24d0fedd9aeee61f0cba15 100644
(file)
--- a/
src/wx/kdm_output_panel.h
+++ b/
src/wx/kdm_output_panel.h
@@
-54,7
+54,6
@@
public:
std::pair<boost::shared_ptr<Job>, int> make (
std::list<KDMWithMetadataPtr > screen_kdms,
std::string name,
std::pair<boost::shared_ptr<Job>, int> make (
std::list<KDMWithMetadataPtr > screen_kdms,
std::string name,
- KDMTimingPanel* timing,
boost::function<bool (boost::filesystem::path)> confirm_overwrite
);
boost::function<bool (boost::filesystem::path)> confirm_overwrite
);