projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing avsubtitle_free().
[dcpomatic.git]
/
src
/
lib
/
overlaps.cc
diff --git
a/src/lib/overlaps.cc
b/src/lib/overlaps.cc
index 983dc7a452f5da7cc7ae75f5f258234ff75830e0..536629b336804b0675fe37b0682f65d8da8dd9fc 100644
(file)
--- a/
src/lib/overlaps.cc
+++ b/
src/lib/overlaps.cc
@@
-1,36
+1,40
@@
/*
/*
- Copyright (C) 2013-20
16
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
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.
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
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/>.
*/
*/
+
#include "overlaps.h"
#include "types.h"
#include "content.h"
#include "overlaps.h"
#include "types.h"
#include "content.h"
-#include <boost/foreach.hpp>
-using boost::shared_ptr;
-using boost::function;
-ContentList overlaps (ContentList cl, function<shared_ptr<ContentPart> (shared_ptr<const Content>)> part, DCPTime from, DCPTime to)
+using std::function;
+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 overlaps;
DCPTimePeriod period (from, to);
{
ContentList overlaps;
DCPTimePeriod period (from, to);
-
BOOST_FOREACH (shared_ptr<Content> i,
cl) {
- if (part(i) && DCPTimePeriod(i->position(), i->end(
)).overlaps
(period)) {
+
for (auto i:
cl) {
+ if (part(i) && DCPTimePeriod(i->position(), i->end(
film)).overlap
(period)) {
overlaps.push_back (i);
}
}
overlaps.push_back (i);
}
}