* CinemaKDM contains the KDMs for its cinema.
*/
list<CinemaKDMs>
-CinemaKDMs::collect (list<KDMWithMetadataPtr> screen_kdms)
+collect (list<KDMWithMetadataPtr> screen_kdms)
{
list<CinemaKDMs> cinema_kdms;
/** Write one directory per cinema into another directory */
int
-CinemaKDMs::write_directories (
+write_directories (
list<CinemaKDMs> cinema_kdms,
boost::filesystem::path directory,
dcp::NameFormat container_name_format,
/** Write one ZIP file per cinema into a directory */
int
-CinemaKDMs::write_zip_files (
+write_zip_files (
list<CinemaKDMs> cinema_kdms,
boost::filesystem::path directory,
dcp::NameFormat container_name_format,
* @param cpl_name Name of the CPL that the KDMs are for.
*/
void
-CinemaKDMs::email (
+email (
list<CinemaKDMs> cinema_kdms,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
public:
void make_zip_file (boost::filesystem::path zip_file, dcp::NameFormat name_format, dcp::NameFormat::Map name_values) const;
- static std::list<CinemaKDMs> collect (std::list<KDMWithMetadataPtr > kdms);
+ boost::shared_ptr<Cinema> cinema;
+ std::list<KDMWithMetadataPtr > screen_kdms;
+};
+
- static int write_directories (
+std::list<CinemaKDMs> collect (std::list<KDMWithMetadataPtr > kdms);
+
+int write_directories (
std::list<CinemaKDMs> cinema_kdms,
boost::filesystem::path directory,
dcp::NameFormat container_name_format,
boost::function<bool (boost::filesystem::path)> confirm_overwrite
);
- static int write_zip_files (
+int write_zip_files (
std::list<CinemaKDMs> cinema_kdms,
boost::filesystem::path directory,
dcp::NameFormat container_name_format,
boost::function<bool (boost::filesystem::path)> confirm_overwrite
);
- static void email (
+void email (
std::list<CinemaKDMs> cinema_kdms,
dcp::NameFormat container_name_format,
dcp::NameFormat filename_format,
std::string cpl_name
);
- boost::shared_ptr<Cinema> cinema;
- std::list<KDMWithMetadataPtr > screen_kdms;
-};
SendKDMEmailJob::run ()
{
set_progress_unknown ();
- CinemaKDMs::email (_cinema_kdms, _container_name_format, _filename_format, _name_values, _cpl_name);
+ email (_cinema_kdms, _container_name_format, _filename_format, _name_values, _cpl_name);
set_progress (1);
set_state (FINISHED_OK);
}
)
{
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,
list<KDMWithMetadataPtr> screen_kdms, string name, KDMTimingPanel* timing, function<bool (boost::filesystem::path)> confirm_overwrite
)
{
- list<CinemaKDMs> const cinema_kdms = CinemaKDMs::collect (screen_kdms);
+ list<CinemaKDMs> const cinema_kdms = collect (screen_kdms);
/* Decide whether to proceed */
confirm_overwrite
);
} else if (_write_folder->GetValue()) {
- written = CinemaKDMs::write_directories (
- CinemaKDMs::collect (screen_kdms),
+ written = write_directories (
+ collect (screen_kdms),
directory(),
_container_name_format->get(),
_filename_format->get(),
confirm_overwrite
);
} else if (_write_zip->GetValue()) {
- written = CinemaKDMs::write_zip_files (
- CinemaKDMs::collect (screen_kdms),
+ written = write_zip_files (
+ collect (screen_kdms),
directory(),
_container_name_format->get(),
_filename_format->get(),