projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename some variables and re-implement collect().
[dcpomatic.git]
/
src
/
wx
/
kdm_output_panel.cc
diff --git
a/src/wx/kdm_output_panel.cc
b/src/wx/kdm_output_panel.cc
index 0320ed1b767629cef1731bc5db6504898cf206d8..025707b287213ea813742d1609166babb2d25f3b 100644
(file)
--- a/
src/wx/kdm_output_panel.cc
+++ b/
src/wx/kdm_output_panel.cc
@@
-20,7
+20,6
@@
#include "lib/config.h"
#include "lib/cinema.h"
#include "lib/config.h"
#include "lib/cinema.h"
-#include "lib/cinema_kdms.h"
#include "lib/send_kdm_email_job.h"
#include "kdm_output_panel.h"
#include "kdm_timing_panel.h"
#include "lib/send_kdm_email_job.h"
#include "kdm_output_panel.h"
#include "kdm_timing_panel.h"
@@
-183,10
+182,10
@@
KDMOutputPanel::kdm_write_type_changed ()
pair<shared_ptr<Job>, int>
KDMOutputPanel::make (
pair<shared_ptr<Job>, int>
KDMOutputPanel::make (
- list<
shared_ptr<KDMWithMetadata> > screen_
kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
+ list<
KDMWithMetadataPtr>
kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
)
{
)
{
- list<
CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_
kdms);
+ list<
list<KDMWithMetadataPtr> > const cinema_kdms = collect (
kdms);
/* Decide whether to proceed */
/* Decide whether to proceed */
@@
-200,8
+199,8
@@
KDMOutputPanel::make (
}
bool cinemas_with_no_email = false;
}
bool cinemas_with_no_email = false;
- BOOST_FOREACH (
CinemaKDMs
i, cinema_kdms) {
- if (i.
cinema
->emails.empty ()) {
+ BOOST_FOREACH (
list<KDMWithMetadataPtr>
i, cinema_kdms) {
+ if (i.
front()->cinema()
->emails.empty ()) {
cinemas_with_no_email = true;
}
}
cinemas_with_no_email = true;
}
}
@@
-215,8
+214,8
@@
KDMOutputPanel::make (
if (proceed && Config::instance()->confirm_kdm_email ()) {
list<string> emails;
if (proceed && Config::instance()->confirm_kdm_email ()) {
list<string> emails;
- BOOST_FOREACH (
CinemaKDMs
i, cinema_kdms) {
- BOOST_FOREACH (string j, i.
cinema
->emails) {
+ BOOST_FOREACH (
list<KDMWithMetadataPtr> const&
i, cinema_kdms) {
+ BOOST_FOREACH (string j, i.
front()->cinema()
->emails) {
emails.push_back (j);
}
}
emails.push_back (j);
}
}
@@
-247,16
+246,16
@@
KDMOutputPanel::make (
if (_write_to->GetValue()) {
if (_write_flat->GetValue()) {
if (_write_to->GetValue()) {
if (_write_flat->GetValue()) {
- written =
KDMWithMetadata::
write_files (
-
screen_
kdms,
+ written = write_files (
+ kdms,
directory(),
_filename_format->get(),
name_values,
confirm_overwrite
);
} else if (_write_folder->GetValue()) {
directory(),
_filename_format->get(),
name_values,
confirm_overwrite
);
} else if (_write_folder->GetValue()) {
- written =
CinemaKDMs::
write_directories (
-
CinemaKDMs::collect (screen_
kdms),
+ written = write_directories (
+
collect (
kdms),
directory(),
_container_name_format->get(),
_filename_format->get(),
directory(),
_container_name_format->get(),
_filename_format->get(),
@@
-264,8
+263,8
@@
KDMOutputPanel::make (
confirm_overwrite
);
} else if (_write_zip->GetValue()) {
confirm_overwrite
);
} else if (_write_zip->GetValue()) {
- written =
CinemaKDMs::
write_zip_files (
-
CinemaKDMs::collect (screen_
kdms),
+ written = write_zip_files (
+
collect (
kdms),
directory(),
_container_name_format->get(),
_filename_format->get(),
directory(),
_container_name_format->get(),
_filename_format->get(),