X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=1d688c31868d49450140e7381994f3431fe6bb5d;hb=5f206d32ff60148ab72b35d5823f56bdbb7f50bf;hp=b52507ed1ede219ccd9d6a50e1624c608011c687;hpb=4219d4b76c5cd5690b1f4fa0c248d93ced26d05a;p=dcpomatic.git diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index b52507ed1..1d688c318 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -18,6 +18,7 @@ */ + /** @file src/encoder.cc * @brief A class which takes a Film and some Options, then uses those to encode the film * into some output format. @@ -26,22 +27,21 @@ * as a parameter to the constructor. */ + #include "encoder.h" #include "player.h" #include "i18n.h" -using boost::weak_ptr; -using boost::shared_ptr; /** Construct an encoder. * @param film Film that we are encoding. * @param job Job that this encoder is being used in. */ -Encoder::Encoder (shared_ptr film, weak_ptr job) +Encoder::Encoder (std::shared_ptr film, std::weak_ptr job) : _film (film) , _job (job) - , _player (new Player(film, film->playlist(), film->length())) + , _player (new Player(film, Image::Alignment::PADDED)) { }