X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdecoder_factory.cc;h=dc01a043a56cf49aa1df7c0baf311be1aa6e9301;hp=ec0140b0c1933ac1eee8bd991aa2f236928d9bb3;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hpb=e669b562937786bf5b771c927cc03a4074b01be8 diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc index ec0140b0c..dc01a043a 100644 --- a/src/lib/decoder_factory.cc +++ b/src/lib/decoder_factory.cc @@ -31,44 +31,42 @@ #include "video_mxf_content.h" #include "video_mxf_decoder.h" #include -#include using std::list; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using boost::make_shared; shared_ptr decoder_factory (shared_ptr content, shared_ptr log, bool fast) { shared_ptr fc = dynamic_pointer_cast (content); if (fc) { - return make_shared (fc, log, fast); + return shared_ptr (new FFmpegDecoder (fc, log, fast)); } shared_ptr dc = dynamic_pointer_cast (content); if (dc) { - return make_shared (dc, log, fast); + return shared_ptr (new DCPDecoder (dc, log, fast)); } shared_ptr ic = dynamic_pointer_cast (content); if (ic) { - return make_shared (ic, log); + return shared_ptr (new ImageDecoder (ic, log)); } shared_ptr rc = dynamic_pointer_cast (content); if (rc) { - return make_shared (rc); + return shared_ptr (new TextSubtitleDecoder (rc)); } shared_ptr dsc = dynamic_pointer_cast (content); if (dsc) { - return make_shared (dsc); + return shared_ptr (new DCPSubtitleDecoder (dsc)); } shared_ptr vmc = dynamic_pointer_cast (content); if (vmc) { - return make_shared (vmc, log); + return shared_ptr (new VideoMXFDecoder (vmc, log)); } return shared_ptr ();