From b24eb0e8fbad6779c77f7015d3a8c8c5cf206706 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 May 2023 23:01:06 +0200 Subject: [PATCH] Put overlaps() into the dcpomatic namespace. --- src/lib/overlaps.cc | 3 ++- src/lib/overlaps.h | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc index fbc6b5cb1..bed75a822 100644 --- a/src/lib/overlaps.cc +++ b/src/lib/overlaps.cc @@ -28,7 +28,8 @@ using std::shared_ptr; using namespace dcpomatic; -ContentList overlaps (shared_ptr film, ContentList cl, function)> part, DCPTime from, DCPTime to) +ContentList +dcpomatic::overlaps(shared_ptr film, ContentList cl, function)> part, DCPTime from, DCPTime to) { ContentList overlaps; DCPTimePeriod period (from, to); diff --git a/src/lib/overlaps.h b/src/lib/overlaps.h index bb8277eaa..f405c0fab 100644 --- a/src/lib/overlaps.h +++ b/src/lib/overlaps.h @@ -27,6 +27,9 @@ class ContentPart; class Film; +namespace dcpomatic { + + /** @return Pieces of content with a given part (video, audio, * subtitle) that overlap a specified time range in the given * ContentList @@ -34,3 +37,7 @@ class Film; ContentList overlaps ( std::shared_ptr film, ContentList cl, std::function)> part, dcpomatic::DCPTime from, dcpomatic::DCPTime to ); + + +} + -- 2.30.2