From c74ddc15f91203e29f6fe50739438347abe6b260 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 6 Dec 2025 20:14:57 +0100 Subject: Cleanup: tidy some assertions. --- src/lib/audio_merger.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/lib/audio_merger.cc') diff --git a/src/lib/audio_merger.cc b/src/lib/audio_merger.cc index 1914f3a64..e7f8f5ccb 100644 --- a/src/lib/audio_merger.cc +++ b/src/lib/audio_merger.cc @@ -81,6 +81,7 @@ AudioMerger::pull(DCPTime time) /* Though time > i.time, overlap could be 0 if the difference in time is less than one frame */ if (overlap > 0) { auto audio = make_shared(i.audio, overlap, 0); + DCPOMATIC_ASSERT(audio->frames() > 0); out.push_back(make_pair(audio, i.time)); i.audio->trim_start(overlap); i.time += DCPTime::from_frames(overlap, _frame_rate); @@ -96,10 +97,6 @@ AudioMerger::pull(DCPTime time) _buffers = new_buffers; - for (auto const& i: out) { - DCPOMATIC_ASSERT(i.first->frames() > 0); - } - return out; } -- cgit v1.2.3