X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=fd826deb6666320ee33be0d0f6591cef9b0b5b10;hp=16d9923141080fc42bc0aacbcee039e6e1585db2;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=666d0b238f32c0383068d3d8f3936f46c4e67a14 diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 16d992314..fd826deb6 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -31,8 +31,8 @@ #include "i18n.h" -using boost::weak_ptr; -using boost::shared_ptr; +using std::weak_ptr; +using std::shared_ptr; /** Construct an encoder. * @param film Film that we are encoding. @@ -41,9 +41,7 @@ using boost::shared_ptr; Encoder::Encoder (shared_ptr film, weak_ptr job) : _film (film) , _job (job) - , _player (new Player (film, film->playlist ())) + , _player (new Player(film)) { - _player_video_connection = _player->Video.connect (bind (&Encoder::video, this, _1, _2)); - _player_audio_connection = _player->Audio.connect (bind (&Encoder::audio, this, _1, _2)); - _player_subtitle_connection = _player->Subtitle.connect (bind (&Encoder::subtitle, this, _1, _2)); + }