diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-05-16 22:14:47 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-05-16 22:14:47 +0200 |
| commit | e08d1ce718493a869e429be3a6f811575f2c8dd1 (patch) | |
| tree | 156c412e3c277d16ec874c79b8453e9b7f4dfa72 | |
| parent | 69f518c6ee7cd1108f99982e2d536e85f7f80b5b (diff) | |
_shuffler can be a optional<>.
| -rw-r--r-- | src/lib/player.cc | 4 | ||||
| -rw-r--r-- | src/lib/player.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index 27b2d8d97..feafd6f1f 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -162,7 +162,7 @@ Player::setup_pieces_unlocked () if (have_threed) { - _shuffler.reset(new Shuffler()); + _shuffler = Shuffler(); _shuffler->Video.connect(bind(&Player::video, this, _1, _2)); } @@ -218,7 +218,7 @@ Player::setup_pieces_unlocked () if (decoder->video) { if (have_threed) { /* We need a Shuffler to cope with 3D L/R video data arriving out of sequence */ - decoder->video->Data.connect (bind(&Shuffler::video, _shuffler.get(), weak_ptr<Piece>(piece), _1)); + decoder->video->Data.connect (bind(&Shuffler::video, &_shuffler.get(), weak_ptr<Piece>(piece), _1)); } else { decoder->video->Data.connect (bind(&Player::video, this, weak_ptr<Piece>(piece), _1)); } diff --git a/src/lib/player.h b/src/lib/player.h index 9318cff5a..3f83d9547 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -208,7 +208,7 @@ private: LastVideoMap _last_video; AudioMerger _audio_merger; - std::unique_ptr<Shuffler> _shuffler; + boost::optional<Shuffler> _shuffler; std::list<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime>> _delay; class StreamState |