projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't clobber configured log types in the player.
[dcpomatic.git]
/
test
/
butler_test.cc
diff --git
a/test/butler_test.cc
b/test/butler_test.cc
index 7fd5ea57113bdb43135b281000a86204b3140284..1c59de798d47eeecd16bf63b2cd2351671287840 100644
(file)
--- a/
test/butler_test.cc
+++ b/
test/butler_test.cc
@@
-32,7
+32,6
@@
using std::make_shared;
using std::make_shared;
-using std::shared_ptr;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
@@
-46,9
+45,9
@@
BOOST_AUTO_TEST_CASE (butler_test1)
film->set_name ("butler_test1");
film->set_container (Ratio::from_id ("185"));
film->set_name ("butler_test1");
film->set_container (Ratio::from_id ("185"));
- auto video = content_factory("test/data/flat_red.png")
.front()
;
+ auto video = content_factory("test/data/flat_red.png")
[0]
;
film->examine_and_add_content (video);
film->examine_and_add_content (video);
- auto audio = content_factory("test/data/staircase.wav")
.front()
;
+ auto audio = content_factory("test/data/staircase.wav")
[0]
;
film->examine_and_add_content (audio);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (audio);
BOOST_REQUIRE (!wait_for_jobs ());
@@
-60,9
+59,11
@@
BOOST_AUTO_TEST_CASE (butler_test1)
map.set (i, i, 1);
}
map.set (i, i, 1);
}
+ Player player(film, Image::Alignment::COMPACT);
+
Butler butler (
film,
Butler butler (
film,
-
make_shared<Player>(film, Image::Alignment::COMPACT)
,
+
player
,
map,
6,
boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
map,
6,
boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
@@
-105,9
+106,11
@@
BOOST_AUTO_TEST_CASE (butler_test2)
map.set (i, i, 1);
}
map.set (i, i, 1);
}
+ Player player(film, Image::Alignment::COMPACT);
+
Butler butler (
film,
Butler butler (
film,
-
make_shared<Player>(film, Image::Alignment::COMPACT)
,
+
player
,
map,
6,
boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),
map,
6,
boost::bind(&PlayerVideo::force, AV_PIX_FMT_RGB24),