diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-09-16 10:10:46 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-09-18 10:41:19 +0200 |
| commit | a9cb7313f7846f8b2bf9f96d19cf28abd7caf7fc (patch) | |
| tree | 020b1ed7922e97c9711641209efdab845cdf65fc /test/time_calculation_test.cc | |
| parent | 5c5da23c412e9b922154f8934e16f3a51ff48bdc (diff) | |
Fix thinko in relative path change.
We have to canonicalise relative paths with respect to the film's
directory on load, otherwise we try to use the relative path and it's
interpreted against the current working directory.
This unfortunately requires the film's directory to be piped into quite
a lot of new places.
Diffstat (limited to 'test/time_calculation_test.cc')
| -rw-r--r-- | test/time_calculation_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/time_calculation_test.cc b/test/time_calculation_test.cc index 0e09ae2c3..28a1c61ab 100644 --- a/test/time_calculation_test.cc +++ b/test/time_calculation_test.cc @@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_time_calculation_test) doc->read_string (xml); list<string> notes; - auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes); + auto content = std::make_shared<FFmpegContent>(doc, boost::none, film->state_version(), notes); /* 25fps content, 25fps DCP */ film->set_video_frame_rate (25); @@ -192,7 +192,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test1) doc->read_string (xml); list<string> notes; - auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes); + auto content = std::make_shared<FFmpegContent>(doc, boost::none, film->state_version(), notes); film->set_sequence (false); film->add_content (content); @@ -398,7 +398,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test2) doc->read_string (xml); list<string> notes; - auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes); + auto content = std::make_shared<FFmpegContent>(doc, boost::none, film->state_version(), notes); film->set_sequence (false); film->add_content (content); @@ -574,7 +574,7 @@ BOOST_AUTO_TEST_CASE (player_time_calculation_test3) doc->read_string (xml); list<string> notes; - auto content = make_shared<FFmpegContent>(doc, film->state_version(), notes); + auto content = std::make_shared<FFmpegContent>(doc, boost::none, film->state_version(), notes); auto stream = content->audio->streams().front(); film->set_sequence (false); film->add_content (content); |