#include "lib/cinema_kdms.h"
#include "lib/config.h"
#include "lib/exceptions.h"
+#include "lib/emailer.h"
#include "lib/safe_stringstream.h"
#include <dcp/certificate.h>
#include <getopt.h>
if (cinemas) {
list<boost::shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
for (list<boost::shared_ptr<Cinema> >::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
- cout << (*i)->name << " (" << (*i)->email << ")\n";
+ cout << (*i)->name << " (" << Emailer::address_list ((*i)->emails) << ")\n";
}
exit (EXIT_SUCCESS);
}
list<shared_ptr<Cinema> > cinemas = Config::instance()->cinemas ();
list<shared_ptr<Cinema> >::const_iterator i = cinemas.begin();
- while (i != cinemas.end() && (*i)->name != cinema_name && (*i)->email != cinema_name) {
+ while (
+ i != cinemas.end() &&
+ (*i)->name != cinema_name &&
+ find ((*i)->emails.begin(), (*i)->emails.end(), cinema_name) == (*i)->emails.end()) {
+
++i;
}
}
try {
- list<ScreenKDM> screen_kdms = ScreenKDM::collect (
- (*i)->screens(),
- film->make_kdms ((*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation)
+ list<ScreenKDM> screen_kdms = film->make_kdms (
+ (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation
);
if (zip) {
- CinemaKDMs::write_zip_files (film, CinemaKDMs::collect (screen_kdms), output);
+ CinemaKDMs::write_zip_files (film->name(), CinemaKDMs::collect (screen_kdms), output);
if (verbose) {
cout << "Wrote ZIP files to " << output << "\n";
}
} else {
- ScreenKDM::write_files (film, screen_kdms, output);
+ ScreenKDM::write_files (film->name(), screen_kdms, output);
if (verbose) {
cout << "Wrote KDM files to " << output << "\n";