diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-05-01 01:31:35 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-05-01 01:31:35 +0200 |
| commit | 8963f0007af1a312017b9627c18b82ec2a577591 (patch) | |
| tree | baeb6f2c17da72248408b8c1d695242b44edda9e /src/lib/shuffler.cc | |
| parent | 29f84e2b8785585885e0658bdf9938967547460f (diff) | |
C++11 tidying.
Diffstat (limited to 'src/lib/shuffler.cc')
| -rw-r--r-- | src/lib/shuffler.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/shuffler.cc b/src/lib/shuffler.cc index a13e7f6de..5a4faf4d1 100644 --- a/src/lib/shuffler.cc +++ b/src/lib/shuffler.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2018-2020 Carl Hetherington <cth@carlh.net> + Copyright (C) 2018-2021 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -18,6 +18,7 @@ */ + #include "shuffler.h" #include "content_video.h" #include "dcpomatic_assert.h" @@ -25,14 +26,17 @@ #include <string> #include <iostream> + using std::make_pair; +using std::shared_ptr; using std::string; using std::weak_ptr; -using std::shared_ptr; using boost::optional; + int const Shuffler::_max_size = 64; + struct Comparator { bool operator()(Shuffler::Store const & a, Shuffler::Store const & b) { @@ -43,6 +47,7 @@ struct Comparator } }; + void Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video) { @@ -54,7 +59,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video) return; } - shared_ptr<Piece> piece = weak_piece.lock (); + auto piece = weak_piece.lock (); DCPOMATIC_ASSERT (piece); if (!_last && video.eyes == Eyes::LEFT) { @@ -103,6 +108,7 @@ Shuffler::video (weak_ptr<Piece> weak_piece, ContentVideo video) } } + void Shuffler::clear () { @@ -111,6 +117,7 @@ Shuffler::clear () _last = optional<ContentVideo>(); } + void Shuffler::flush () { |