projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
content_factory.cc
diff --git
a/src/lib/content_factory.cc
b/src/lib/content_factory.cc
index 825c8049854ba3032519b7d27430560a18d9f8b8..092efd7903d7dba9219c483c57a03307d6733945 100644
(file)
--- a/
src/lib/content_factory.cc
+++ b/
src/lib/content_factory.cc
@@
-25,17
+25,18
@@
#include "util.h"
using std::string;
#include "util.h"
using std::string;
+using std::list;
using boost::shared_ptr;
shared_ptr<Content>
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") {
{
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") {
} else if (type == "Image") {
content.reset (new ImageContent (film, node, version));
} else if (type == "Sndfile") {