projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various playlist editor developments and fixes.
[dcpomatic.git]
/
test
/
ffmpeg_audio_test.cc
diff --git
a/test/ffmpeg_audio_test.cc
b/test/ffmpeg_audio_test.cc
index 0aafb505fd9bcd65cf8f3b1333842b207619bd8e..067075d254a2650809c447a6639caf6f2d31cfa2 100644
(file)
--- a/
test/ffmpeg_audio_test.cc
+++ b/
test/ffmpeg_audio_test.cc
@@
-48,10
+48,10
@@
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
{
shared_ptr<Film> film = new_test_film ("ffmpeg_audio_test");
film->set_name ("ffmpeg_audio_test");
{
shared_ptr<Film> film = new_test_film ("ffmpeg_audio_test");
film->set_name ("ffmpeg_audio_test");
- shared_ptr<FFmpegContent> c (new FFmpegContent (
film,
"test/data/staircase.mov"));
+ shared_ptr<FFmpegContent> c (new FFmpegContent ("test/data/staircase.mov"));
film->examine_and_add_content (c);
film->examine_and_add_content (c);
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
c->video->set_scale (VideoContentScale (Ratio::from_id ("185")));
@@
-61,7
+61,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
film->make_dcp ();
film->write_metadata ();
film->make_dcp ();
film->write_metadata ();
-
wait_for_jobs (
);
+
BOOST_REQUIRE (!wait_for_jobs()
);
boost::filesystem::path path = "build/test";
path /= "ffmpeg_audio_test";
boost::filesystem::path path = "build/test";
path /= "ffmpeg_audio_test";
@@
-130,7
+130,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
{
shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test2");
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
{
shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test2");
- shared_ptr<Content> content = content_factory(
film,
private_data / "wayne.mkv").front();
+ shared_ptr<Content> content = content_factory(private_data / "wayne.mkv").front();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
@@
-142,7
+142,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test2)
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
{
shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test2");
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test3)
{
shared_ptr<Film> film = new_test_film2 ("ffmpeg_audio_test2");
- shared_ptr<Content> content = content_factory(
film,
private_data / "wayne.mkv").front();
+ shared_ptr<Content> content = content_factory(private_data / "wayne.mkv").front();
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());
film->examine_and_add_content (content);
BOOST_REQUIRE (!wait_for_jobs ());