diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-07 12:03:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-09 13:44:54 +0100 |
| commit | 9d63be286e8bc09dd1cf8deea5c58dda0a534c1e (patch) | |
| tree | 03105faedd1753195b4770d24eebbdcab4a5b01d /src/tools | |
| parent | 4121af462c1e8b98866ca206a64678fcba96fde7 (diff) | |
Remove the need for ScreenKDM::collect.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 2 | ||||
| -rw-r--r-- | src/tools/dcpomatic_kdm_cli.cc | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 6e20dda9e..36817eb53 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -448,7 +448,7 @@ private: if (d->write_to ()) { ScreenKDM::write_files ( _film, - ScreenKDM::collect (d->screens(), _film->make_kdms (d->screens(), d->cpl(), d->from(), d->until(), d->formulation())), + _film->make_kdms (d->screens(), d->cpl(), d->from(), d->until(), d->formulation()), d->directory() ); } else { diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index cf28ec53f..713db3ce5 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -277,9 +277,8 @@ int main (int argc, char* argv[]) } 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) { |