projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash on opening properties for audio-only files.
[dcpomatic.git]
/
test
/
player_test.cc
diff --git
a/test/player_test.cc
b/test/player_test.cc
index 12e928a3528a9267840b035e4cd7e0eb10bf0e51..1b628f72a3034d051f7cfe02a71c28a3ee99d237 100644
(file)
--- a/
test/player_test.cc
+++ b/
test/player_test.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2014 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/>.
*/
*/
@@
-35,6
+36,12
@@
using std::cout;
using std::list;
using boost::shared_ptr;
using std::list;
using boost::shared_ptr;
+static bool
+valid (Content const *)
+{
+ return true;
+}
+
/** Player::overlaps */
BOOST_AUTO_TEST_CASE (player_overlaps_test)
{
/** Player::overlaps */
BOOST_AUTO_TEST_CASE (player_overlaps_test)
{
@@
-59,23
+66,23
@@
BOOST_AUTO_TEST_CASE (player_overlaps_test)
shared_ptr<Player> player (new Player (film, film->playlist ()));
shared_ptr<Player> player (new Player (film, film->playlist ()));
- list<shared_ptr<Piece> > o = player->overlaps
<FFmpegContent> (DCPTime::from_seconds (0), DCPTime::from_seconds (5)
);
+ list<shared_ptr<Piece> > o = player->overlaps
(DCPTime::from_seconds (0), DCPTime::from_seconds (5), &valid
);
BOOST_CHECK_EQUAL (o.size(), 1U);
BOOST_CHECK_EQUAL (o.front()->content, A);
BOOST_CHECK_EQUAL (o.size(), 1U);
BOOST_CHECK_EQUAL (o.front()->content, A);
- o = player->overlaps
<FFmpegContent> (DCPTime::from_seconds (5), DCPTime::from_seconds (8)
);
+ o = player->overlaps
(DCPTime::from_seconds (5), DCPTime::from_seconds (8), &valid
);
BOOST_CHECK_EQUAL (o.size(), 0U);
BOOST_CHECK_EQUAL (o.size(), 0U);
- o = player->overlaps
<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (12)
);
+ o = player->overlaps
(DCPTime::from_seconds (8), DCPTime::from_seconds (12), &valid
);
BOOST_CHECK_EQUAL (o.size(), 1U);
BOOST_CHECK_EQUAL (o.front()->content, B);
BOOST_CHECK_EQUAL (o.size(), 1U);
BOOST_CHECK_EQUAL (o.front()->content, B);
- o = player->overlaps
<FFmpegContent> (DCPTime::from_seconds (2), DCPTime::from_seconds (12)
);
+ o = player->overlaps
(DCPTime::from_seconds (2), DCPTime::from_seconds (12), &valid
);
BOOST_CHECK_EQUAL (o.size(), 2U);
BOOST_CHECK_EQUAL (o.front()->content, A);
BOOST_CHECK_EQUAL (o.back()->content, B);
BOOST_CHECK_EQUAL (o.size(), 2U);
BOOST_CHECK_EQUAL (o.front()->content, A);
BOOST_CHECK_EQUAL (o.back()->content, B);
- o = player->overlaps
<FFmpegContent> (DCPTime::from_seconds (8), DCPTime::from_seconds (11)
);
+ o = player->overlaps
(DCPTime::from_seconds (8), DCPTime::from_seconds (11), &valid
);
BOOST_CHECK_EQUAL (o.size(), 1U);
BOOST_CHECK_EQUAL (o.front()->content, B);
}
BOOST_CHECK_EQUAL (o.size(), 1U);
BOOST_CHECK_EQUAL (o.front()->content, B);
}