diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-11-24 01:52:23 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-11-24 01:52:23 +0000 |
| commit | 8bef34f672815c3c9b4236d06fdee8dfd0bffbc2 (patch) | |
| tree | d37c47bf3ccb308f7a2959be0c2ef9c0e7ec9575 /src/lib/content_factory.cc | |
| parent | c3da7c64f01420447dbab7f5c2ea42ff1b911cc5 (diff) | |
Various joining fixes.
Diffstat (limited to 'src/lib/content_factory.cc')
| -rw-r--r-- | src/lib/content_factory.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index e800628c1..bab22b8eb 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -27,18 +27,18 @@ using std::string; using boost::shared_ptr; shared_ptr<Content> -content_factory (shared_ptr<const Film> film, cxml::NodePtr node) +content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version) { string const type = node->string_child ("Type"); boost::shared_ptr<Content> content; if (type == "FFmpeg") { - content.reset (new FFmpegContent (film, node)); + content.reset (new FFmpegContent (film, node, version)); } else if (type == "Image") { - content.reset (new ImageContent (film, node)); + content.reset (new ImageContent (film, node, version)); } else if (type == "Sndfile") { - content.reset (new SndfileContent (film, node)); + content.reset (new SndfileContent (film, node, version)); } return content; |