projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify and fix up selection code for the content list (#2428).
[dcpomatic.git]
/
test
/
ffmpeg_audio_test.cc
diff --git
a/test/ffmpeg_audio_test.cc
b/test/ffmpeg_audio_test.cc
index 6bdadce97e1027b6211c042fbd0a9571bd2ed7a3..054567d3b2e136444416ba8a644481e3b01d20ce 100644
(file)
--- a/
test/ffmpeg_audio_test.cc
+++ b/
test/ffmpeg_audio_test.cc
@@
-46,7
+46,6
@@
using std::make_shared;
using std::string;
using std::make_shared;
using std::string;
-using std::shared_ptr;
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
@@
-131,7
+130,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
{
auto film = new_test_film2 ("ffmpeg_audio_test2");
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
{
auto film = new_test_film2 ("ffmpeg_audio_test2");
- auto content = content_factory(TestPaths::private_data() / "wayne.mkv")
.front()
;
+ auto content = content_factory(TestPaths::private_data() / "wayne.mkv")
[0]
;
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
@@
-144,7
+143,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
{
auto film = new_test_film2 ("ffmpeg_audio_test3");
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
{
auto film = new_test_film2 ("ffmpeg_audio_test3");
- auto content = content_factory(TestPaths::private_data() / "wayne.mkv")
.front()
;
+ auto content = content_factory(TestPaths::private_data() / "wayne.mkv")
[0]
;
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
@@
-158,7
+157,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test4)
{
auto film = new_test_film2 ("ffmpeg_audio_test4");
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test4)
{
auto film = new_test_film2 ("ffmpeg_audio_test4");
- auto content = content_factory(TestPaths::private_data() / "Actuellement aout 2020.wmv")
.front()
;
+ auto content = content_factory(TestPaths::private_data() / "Actuellement aout 2020.wmv")
[0]
;
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());