X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_seek_test.cc;h=8adcbf8b8c901c061d982b9e8b8ebb9017d84855;hb=20c70c93a38551842721ddee2e08c7b33a7bb924;hp=b8bfe3532d144d6f54df28f3e705a7b8d9c57783;hpb=84012cdd64f451891febd36154b7226ea21a899b;p=dcpomatic.git diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc index b8bfe3532..8adcbf8b8 100644 --- a/test/ffmpeg_decoder_seek_test.cc +++ b/test/ffmpeg_decoder_seek_test.cc @@ -44,6 +44,7 @@ using std::list; using std::cout; using boost::shared_ptr; using boost::optional; +using namespace dcpomatic; static optional stored; static bool @@ -66,13 +67,13 @@ check (shared_ptr decoder, int frame) static void test (boost::filesystem::path file, vector frames) { - boost::filesystem::path path = private_data / file; + boost::filesystem::path path = TestPaths::private_data / file; BOOST_REQUIRE (boost::filesystem::exists (path)); shared_ptr film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string()); shared_ptr content (new FFmpegContent (path)); film->examine_and_add_content (content); - wait_for_jobs (); + BOOST_REQUIRE (!wait_for_jobs()); shared_ptr decoder (new FFmpegDecoder (film, content, false)); decoder->video->Data.connect (bind (&store, _1));