projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: test tidying.
[dcpomatic.git]
/
test
/
overlap_video_test.cc
diff --git
a/test/overlap_video_test.cc
b/test/overlap_video_test.cc
index 3c969921d8045dc956cc2e25369e28d2f89e181b..92002496aec9814651ba39955deec1005ccadd68 100644
(file)
--- a/
test/overlap_video_test.cc
+++ b/
test/overlap_video_test.cc
@@
-23,6
+23,7
@@
#include "lib/content_factory.h"
#include "lib/dcpomatic_time.h"
#include "lib/film.h"
#include "lib/content_factory.h"
#include "lib/dcpomatic_time.h"
#include "lib/film.h"
+#include "lib/piece.h"
#include "lib/player.h"
#include "lib/video_content.h"
#include "test.h"
#include "lib/player.h"
#include "lib/video_content.h"
#include "test.h"
@@
-34,7
+35,6
@@
#include <dcp/openjpeg_image.h>
#include <dcp/reel.h>
#include <dcp/reel_mono_picture_asset.h>
#include <dcp/openjpeg_image.h>
#include <dcp/reel.h>
#include <dcp/reel_mono_picture_asset.h>
-#include <boost/shared_ptr.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/test/unit_test.hpp>
@@
-46,9
+46,9
@@
BOOST_AUTO_TEST_CASE (overlap_video_test1)
{
auto film = new_test_film2 ("overlap_video_test1");
film->set_sequence (false);
{
auto film = new_test_film2 ("overlap_video_test1");
film->set_sequence (false);
- auto A = content_factory("test/data/flat_red.png")
.front()
;
+ auto A = content_factory("test/data/flat_red.png")
[0]
;
film->examine_and_add_content (A);
film->examine_and_add_content (A);
- auto B = content_factory("test/data/flat_green.png")
.front()
;
+ auto B = content_factory("test/data/flat_green.png")
[0]
;
film->examine_and_add_content (B);
BOOST_REQUIRE (!wait_for_jobs());
film->examine_and_add_content (B);
BOOST_REQUIRE (!wait_for_jobs());