projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull methods out of CinemaKDMs.
[dcpomatic.git]
/
src
/
tools
/
dcpomatic_kdm_cli.cc
diff --git
a/src/tools/dcpomatic_kdm_cli.cc
b/src/tools/dcpomatic_kdm_cli.cc
index 505a70c2bcc7d3574206bf16d1834c12bbd8a5c1..493eea2c99acb68093ee51e5862f143c3524803a 100644
(file)
--- a/
src/tools/dcpomatic_kdm_cli.cc
+++ b/
src/tools/dcpomatic_kdm_cli.cc
@@
-24,7
+24,7
@@
#include "lib/film.h"
#include "lib/cinema.h"
#include "lib/film.h"
#include "lib/cinema.h"
-#include "lib/
screen_kdm
.h"
+#include "lib/
kdm_with_metadata
.h"
#include "lib/cinema_kdms.h"
#include "lib/config.h"
#include "lib/exceptions.h"
#include "lib/cinema_kdms.h"
#include "lib/config.h"
#include "lib/exceptions.h"
@@
-130,7
+130,7
@@
always_overwrite ()
void
write_files (
void
write_files (
- list<
shared_ptr<ScreenKDM>
> screen_kdms,
+ list<
KDMWithMetadataPtr
> screen_kdms,
bool zip,
boost::filesystem::path output,
dcp::NameFormat container_name_format,
bool zip,
boost::filesystem::path output,
dcp::NameFormat container_name_format,
@@
-140,8
+140,8
@@
write_files (
)
{
if (zip) {
)
{
if (zip) {
- int const N =
CinemaKDMs::
write_zip_files (
-
CinemaKDMs::
collect (screen_kdms),
+ int const N = write_zip_files (
+ collect (screen_kdms),
output,
container_name_format,
filename_format,
output,
container_name_format,
filename_format,
@@
-153,7
+153,7
@@
write_files (
cout << "Wrote " << N << " ZIP files to " << output << "\n";
}
} else {
cout << "Wrote " << N << " ZIP files to " << output << "\n";
}
} else {
- int const N =
ScreenKDM::
write_files (
+ int const N = write_files (
screen_kdms, output, filename_format, values,
bind (&always_overwrite)
);
screen_kdms, output, filename_format, values,
bind (&always_overwrite)
);
@@
-229,7
+229,7
@@
from_film (
values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
try {
values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
try {
- list<
shared_ptr<ScreenKDM>
> kdms;
+ list<
KDMWithMetadataPtr
> kdms;
BOOST_FOREACH (shared_ptr<Screen> i, screens) {
if (i->recipient) {
BOOST_FOREACH (shared_ptr<Screen> i, screens) {
if (i->recipient) {
@@
-244,7
+244,11
@@
from_film (
disable_forensic_marking_audio
);
disable_forensic_marking_audio
);
- kdms.push_back (shared_ptr<ScreenKDM>(new DCPScreenKDM(i, kdm)));
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+
+ kdms.push_back (KDMWithMetadataPtr(new DCPKDMWithMetadata(name_values, i->cinema, kdm)));
}
}
}
}
@@
-345,16
+349,21
@@
from_dkdm (
values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
try {
values['e'] = dcp::LocalTime(valid_to).date() + " " + dcp::LocalTime(valid_to).time_of_day(true, false);
try {
- list<
shared_ptr<ScreenKDM>
> screen_kdms;
+ list<
KDMWithMetadataPtr
> screen_kdms;
BOOST_FOREACH (shared_ptr<Screen> i, screens) {
if (!i->recipient) {
continue;
}
BOOST_FOREACH (shared_ptr<Screen> i, screens) {
if (!i->recipient) {
continue;
}
+ dcp::NameFormat::Map name_values;
+ name_values['c'] = i->cinema->name;
+ name_values['s'] = i->name;
+
screen_kdms.push_back (
screen_kdms.push_back (
- shared_ptr<ScreenKDM>(
- new DCPScreenKDM(
- i,
+ KDMWithMetadataPtr(
+ new DCPKDMWithMetadata(
+ name_values,
+ i->cinema,
kdm_from_dkdm(
dkdm,
i->recipient.get(),
kdm_from_dkdm(
dkdm,
i->recipient.get(),