diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-23 17:18:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-23 17:18:49 +0100 |
| commit | 64a2f1bb6a7b972607fa363631ef7a47444e8217 (patch) | |
| tree | 020c028a93f113e372e70f485857ce04dea5db3d /src/lib/playlist.cc | |
| parent | 8c6fe8e1e8c8f6d5932606f2a5b6e1b87681ae38 (diff) | |
Various bits and pieces.
Diffstat (limited to 'src/lib/playlist.cc')
| -rw-r--r-- | src/lib/playlist.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc index 36d6c6b52..7ab320558 100644 --- a/src/lib/playlist.cc +++ b/src/lib/playlist.cc @@ -122,7 +122,7 @@ Playlist::video_digest () const /** @param node <Playlist> node */ void -Playlist::set_from_xml (shared_ptr<const cxml::Node> node) +Playlist::set_from_xml (shared_ptr<const Film> film, shared_ptr<const cxml::Node> node) { list<shared_ptr<cxml::Node> > c = node->node_children ("Content"); for (list<shared_ptr<cxml::Node> >::iterator i = c.begin(); i != c.end(); ++i) { @@ -131,11 +131,11 @@ Playlist::set_from_xml (shared_ptr<const cxml::Node> node) boost::shared_ptr<Content> content; if (type == "FFmpeg") { - content.reset (new FFmpegContent (*i)); + content.reset (new FFmpegContent (film, *i)); } else if (type == "ImageMagick") { - content.reset (new ImageMagickContent (*i)); + content.reset (new ImageMagickContent (film, *i)); } else if (type == "Sndfile") { - content.reset (new SndfileContent (*i)); + content.reset (new SndfileContent (film, *i)); } _content.push_back (content); @@ -261,11 +261,11 @@ Playlist::best_dcp_frame_rate () const } Time -Playlist::length (shared_ptr<const Film> film) const +Playlist::length () const { Time len = 0; for (ContentList::const_iterator i = _content.begin(); i != _content.end(); ++i) { - len = max (len, (*i)->end (film)); + len = max (len, (*i)->end ()); } return len; |