Change end() to only do one thing, and copy the required stuff into pause()

[dcpomatic.git] / src / lib / dcp_encoder.cc

diff --git a/src/lib/dcp_encoder.cc b/src/lib/dcp_encoder.cc
index 16a99e79e0ff28563c8d9546641b83ee10014d50..1b1b117be6d9e93741c6e1cf38f53c2ef2466a13 100644 (file)
--- a/src/lib/dcp_encoder.cc
+++ b/src/lib/dcp_encoder.cc
@@ -68,10 +68,10 @@ DCPEncoder::DCPEncoder (shared_ptr<const Film> film, weak_ptr<Job> job)
        , _finishing (false)
        , _non_burnt_subtitles (false)
 {
-       _player_video_connection = _player->Video.connect (bind (&DCPEncoder::video, this, _1, _2));
-       _player_audio_connection = _player->Audio.connect (bind (&DCPEncoder::audio, this, _1, _2));
-       _player_text_connection = _player->Text.connect (bind (&DCPEncoder::text, this, _1, _2, _3, _4));
-       _player_atmos_connection = _player->Atmos.connect (bind (&DCPEncoder::atmos, this, _1, _2, _3));
+       _player_video_connection = _player.Video.connect(bind(&DCPEncoder::video, this, _1, _2));
+       _player_audio_connection = _player.Audio.connect(bind(&DCPEncoder::audio, this, _1, _2));
+       _player_text_connection = _player.Text.connect(bind(&DCPEncoder::text, this, _1, _2, _3, _4));
+       _player_atmos_connection = _player.Atmos.connect(bind(&DCPEncoder::atmos, this, _1, _2, _3));
 
        for (auto c: film->content ()) {
                for (auto i: c->text) {
@@ -104,10 +104,10 @@ DCPEncoder::go ()
        }
 
        if (_non_burnt_subtitles) {
-               _writer.write(_player->get_subtitle_fonts());
+               _writer.write(_player.get_subtitle_fonts());
        }
 
-       while (!_player->pass ()) {}
+       while (!_player.pass()) {}
 
        for (auto i: get_referenced_reel_assets(_film, _film->playlist())) {
                _writer.write(i);
@@ -118,6 +118,20 @@ DCPEncoder::go ()
        _writer.finish(_film->dir(_film->dcp_name()));
 }
 
+
+void
+DCPEncoder::pause()
+{
+       _j2k_encoder.pause();
+}
+
+
+void
+DCPEncoder::resume()
+{
+       _j2k_encoder.resume();
+}
+
 void
 DCPEncoder::video (shared_ptr<PlayerVideo> data, DCPTime time)
 {