X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplaylist.cc;h=85957e106803be886e4f5a85016f15cc21282282;hb=HEAD;hp=2f261d8a0ddb7d4c496a4065017ad8d4e9d0bc56;hpb=b4489de4679a41c96fe0dd5449a8721cdb2294b2;p=dcpomatic.git

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 2f261d8a0..85957e106 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -647,8 +647,8 @@ Playlist::move_later (shared_ptr<const Film> film, shared_ptr<Content> c)
 int64_t
 Playlist::required_disk_space (shared_ptr<const Film> 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();
+	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();
 
 	for (auto i: content()) {
 		auto d = dynamic_pointer_cast<DCPContent> (i);
@@ -657,7 +657,7 @@ Playlist::required_disk_space (shared_ptr<const Film> film, int j2k_bandwidth, i
 				video -= uint64_t (j2k_bandwidth / 8) * d->length_after_trim(film).seconds();
 			}
 			if (d->reference_audio()) {
-				audio -= uint64_t (audio_channels * audio_frame_rate * 3) * d->length_after_trim(film).seconds();
+				audio -= uint64_t(audio_channels) * audio_frame_rate * 3 * d->length_after_trim(film).seconds();
 			}
 		}
 	}
@@ -684,7 +684,7 @@ Playlist::content_summary (shared_ptr<const Film> film, DCPTimePeriod period) co
 		}
 
 		if (score > best_score) {
-			best_summary = i->path(0).leaf().string();
+			best_summary = i->path(0).filename().string();
 			best_score = score;
 		}
 	}