summaryrefslogtreecommitdiff
path: root/src/lib/audio_merger.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-12-06 20:14:57 +0100
committerCarl Hetherington <cth@carlh.net>2025-12-06 20:14:57 +0100
commitc74ddc15f91203e29f6fe50739438347abe6b260 (patch)
tree48e2472d10d7af5c8d700223c2b4f3bedc3ab929 /src/lib/audio_merger.cc
parent79d808a2e8f92ec88e6a136e2816b9ca8a881aa0 (diff)
Cleanup: tidy some assertions.
Diffstat (limited to 'src/lib/audio_merger.cc')
-rw-r--r--src/lib/audio_merger.cc5
1 files changed, 1 insertions, 4 deletions
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<AudioBuffers>(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;
}