summaryrefslogtreecommitdiff
path: root/src/lib/decoder_factory.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-11-21 02:45:30 +0000
committerCarl Hetherington <cth@carlh.net>2018-11-21 02:45:30 +0000
commit84012cdd64f451891febd36154b7226ea21a899b (patch)
tree096fb898aa14d936dfc8f8598a6908337508233c /src/lib/decoder_factory.cc
parent254b3044d72de6b033d7c584f5abd2b9aa70aad5 (diff)
Put Film pointer into Decoder.
Diffstat (limited to 'src/lib/decoder_factory.cc')
-rw-r--r--src/lib/decoder_factory.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc
index b3e16a3f0..4b2a594e1 100644
--- a/src/lib/decoder_factory.cc
+++ b/src/lib/decoder_factory.cc
@@ -47,7 +47,7 @@ decoder_factory (shared_ptr<const Film> film, shared_ptr<const Content> content,
shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (content);
if (dc) {
try {
- return shared_ptr<Decoder> (new DCPDecoder(dc, fast));
+ return shared_ptr<Decoder> (new DCPDecoder(film, dc, fast));
} catch (KDMError& e) {
/* This will be found and reported to the user when the content is examined */
return shared_ptr<Decoder>();
@@ -56,22 +56,22 @@ decoder_factory (shared_ptr<const Film> film, shared_ptr<const Content> content,
shared_ptr<const ImageContent> ic = dynamic_pointer_cast<const ImageContent> (content);
if (ic) {
- return shared_ptr<Decoder> (new ImageDecoder(ic));
+ return shared_ptr<Decoder> (new ImageDecoder(film, ic));
}
shared_ptr<const StringTextFileContent> rc = dynamic_pointer_cast<const StringTextFileContent> (content);
if (rc) {
- return shared_ptr<Decoder> (new StringTextFileDecoder(rc));
+ return shared_ptr<Decoder> (new StringTextFileDecoder(film, rc));
}
shared_ptr<const DCPSubtitleContent> dsc = dynamic_pointer_cast<const DCPSubtitleContent> (content);
if (dsc) {
- return shared_ptr<Decoder> (new DCPSubtitleDecoder(dsc));
+ return shared_ptr<Decoder> (new DCPSubtitleDecoder(film, dsc));
}
shared_ptr<const VideoMXFContent> vmc = dynamic_pointer_cast<const VideoMXFContent> (content);
if (vmc) {
- return shared_ptr<Decoder> (new VideoMXFDecoder(vmc));
+ return shared_ptr<Decoder> (new VideoMXFDecoder(film, vmc));
}
return shared_ptr<Decoder> ();