diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-15 20:39:47 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-15 20:39:47 +0000 |
| commit | 816b3c2dda2c5e33900f5d90a001284045040b5f (patch) | |
| tree | e6f80be308f26dfdf2bb2e1996755315c075c72f /src/lib/content_factory.cc | |
| parent | c9f11d1367a54313e61abbaef7c075ed336b7f79 (diff) | |
| parent | 5d3ebbb2e7844485e8dddd6471209d56b05633ae (diff) | |
Merge master.
Diffstat (limited to 'src/lib/content_factory.cc')
| -rw-r--r-- | src/lib/content_factory.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc index bab22b8eb..98b1dd859 100644 --- a/src/lib/content_factory.cc +++ b/src/lib/content_factory.cc @@ -24,17 +24,18 @@ #include "util.h" using std::string; +using std::list; using boost::shared_ptr; shared_ptr<Content> -content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version) +content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, list<string>& notes) { string const type = node->string_child ("Type"); boost::shared_ptr<Content> content; if (type == "FFmpeg") { - content.reset (new FFmpegContent (film, node, version)); + content.reset (new FFmpegContent (film, node, version, notes)); } else if (type == "Image") { content.reset (new ImageContent (film, node, version)); } else if (type == "Sndfile") { |