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 /src/lib/playlist.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 'src/lib/playlist.cc')
| -rw-r--r-- | src/lib/playlist.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index b6b796840..ebeac47e2 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -25,6 +25,7 @@ #include "content_factory.h" #include "dcp_content.h" #include "digester.h" +#include "film.h" #include "ffmpeg_content.h" #include "ffmpeg_decoder.h" #include "image_decoder.h" @@ -226,7 +227,7 @@ Playlist::set_from_xml (shared_ptr<const Film> film, cxml::ConstNodePtr node, in boost::mutex::scoped_lock lm (_mutex); for (auto i: node->node_children ("Content")) { - auto content = content_factory (i, version, notes); + auto content = content_factory(i, film->directory(), version, notes); /* See if this content should be nudged to start on a video frame */ auto const old_pos = content->position(); |