Make terminate_threads() less likely to leave _threads containing invalid pointers.

[dcpomatic.git] / src / lib / overlaps.h

diff --git a/src/lib/overlaps.h b/src/lib/overlaps.h
index d8a44b554d76bbe12f4b0e2d63d5b836a0ee8d88..be3edf9d42559bae365c3e6f364a8572dd4705cf 100644 (file)
--- a/src/lib/overlaps.h
+++ b/src/lib/overlaps.h
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,10 +22,12 @@
 #include "dcpomatic_time.h"
 
 class ContentPart;
+class Film;
 
 /** @return Pieces of content with a given part (video, audio,
- * subtitle) that overlap a specified time range in the given
- * ContentList */
+ *  subtitle) that overlap a specified time range in the given
+ *  ContentList
+ */
 ContentList overlaps (
-       ContentList cl, boost::function<boost::shared_ptr<ContentPart> (boost::shared_ptr<const Content>)> part, DCPTime from, DCPTime to
+       boost::shared_ptr<const Film> film, ContentList cl, boost::function<bool (boost::shared_ptr<const Content>)> part, DCPTime from, DCPTime to
        );