From 8bef34f672815c3c9b4236d06fdee8dfd0bffbc2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 24 Nov 2013 01:52:23 +0000 Subject: Various joining fixes. --- src/lib/content_factory.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/content_factory.cc') 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_factory (shared_ptr film, cxml::NodePtr node) +content_factory (shared_ptr film, cxml::NodePtr node, int version) { string const type = node->string_child ("Type"); boost::shared_ptr 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; -- cgit v1.2.3