X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdecoder_factory.cc;h=1acef6f4fbe9326d8b50d0f59050f0489a55e6bc;hb=924f4edb20d14bc697956254951fb87513cf2e19;hp=2ded95fefe1b343609f62959dd29b3c7a1edfa08;hpb=1f88a38a2a607c21988a403e76f315444c4be36b;p=dcpomatic.git diff --git a/src/lib/decoder_factory.cc b/src/lib/decoder_factory.cc index 2ded95fef..1acef6f4f 100644 --- a/src/lib/decoder_factory.cc +++ b/src/lib/decoder_factory.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2019 Carl Hetherington + Copyright (C) 2016-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -18,6 +18,8 @@ */ +#include "atmos_mxf_content.h" +#include "atmos_mxf_decoder.h" #include "ffmpeg_content.h" #include "ffmpeg_decoder.h" #include "dcp_content.h" @@ -31,11 +33,10 @@ #include "video_mxf_content.h" #include "video_mxf_decoder.h" #include "timer.h" -#include using std::list; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; template shared_ptr @@ -89,5 +90,10 @@ decoder_factory (shared_ptr film, shared_ptr content, return shared_ptr (new VideoMXFDecoder(film, vmc)); } + shared_ptr amc = dynamic_pointer_cast (content); + if (amc) { + return shared_ptr (new AtmosMXFDecoder(film, amc)); + } + return shared_ptr (); }