From a7cd9cec31952b932ab80fb50cddec28aab74736 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 24 Jul 2020 23:18:24 +0200 Subject: WIP --- src/lib/playlist.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/lib/playlist.cc') diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index b96b0fbe0..30045e2e4 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -625,20 +625,22 @@ Playlist::move_later (shared_ptr film, shared_ptr c) c->set_position (film, c->position() + next_c->length_after_trim(film)); } -int64_t +size_t Playlist::required_disk_space (shared_ptr film, int j2k_bandwidth, int audio_channels, int audio_frame_rate) const { - int64_t video = uint64_t (j2k_bandwidth / 8) * length(film).seconds(); - int64_t audio = uint64_t (audio_channels * audio_frame_rate * 3) * length(film).seconds(); + size_t video = static_cast(j2k_bandwidth / 8) * length(film).seconds(); + size_t audio = static_cast(audio_channels * audio_frame_rate * 3) * length(film).seconds(); BOOST_FOREACH (shared_ptr i, content()) { shared_ptr d = dynamic_pointer_cast (i); if (d) { + DCPTime const len = d->length_after_trim(film); + DCPOMATIC_ASSERT (len.get() >= 0); if (d->reference_video()) { - video -= uint64_t (j2k_bandwidth / 8) * d->length_after_trim(film).seconds(); + video -= static_cast(j2k_bandwidth / 8) * len.seconds(); } if (d->reference_audio()) { - audio -= uint64_t (audio_channels * audio_frame_rate * 3) * d->length_after_trim(film).seconds(); + audio -= static_cast(audio_channels * audio_frame_rate * 3) * len.seconds(); } } } -- cgit v1.2.3