Put overlaps() into the dcpomatic namespace.

diff --git a/src/lib/overlaps.cc b/src/lib/overlaps.cc
index fbc6b5cb1813c7646950f554c25cc952f8e6a5d0..bed75a8221947fbb67de245195413d30145e66c1 100644 (file)
--- 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<const Film> film, ContentList cl, function<bool (shared_ptr<const Content>)> part, DCPTime from, DCPTime to)
+ContentList
+dcpomatic::overlaps(shared_ptr<const Film> film, ContentList cl, function<bool (shared_ptr<const Content>)> part, DCPTime from, DCPTime to)
 {
        ContentList overlaps;
        DCPTimePeriod period (from, to);

diff --git a/src/lib/overlaps.h b/src/lib/overlaps.h
index bb8277eaa91807966e2adf0f2779b1706211d283..f405c0fabffc80e79890a9d606f6212df4da73a9 100644 (file)
--- 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<const Film> film, ContentList cl, std::function<bool (std::shared_ptr<const Content>)> part, dcpomatic::DCPTime from, dcpomatic::DCPTime to
        );
+
+
+}
+