diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-04-23 15:48:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-04-23 15:48:19 +0200 |
| commit | 990f879d9af6300068af44c431b1a8e158e7f7a0 (patch) | |
| tree | b938ca31af91c256f01eae8c3566a95763eefdfa /src/lib/player.h | |
| parent | 4b7185e4eda53534c4d71a1f31ba33ca3dd8dc8d (diff) | |
Nicer fix for 86102d30bf0aad89115bbeb3d8aaa2a27a0aa432
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 407f7651a..51de78982 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -69,7 +69,8 @@ public: class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable { public: - Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist> playlist, dcpomatic::DCPTime playback_length); + Player (boost::shared_ptr<const Film>); + Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist> playlist); ~Player (); bool pass (); @@ -82,7 +83,6 @@ public: return _video_container_size; } - void set_playback_length (dcpomatic::DCPTime len); void set_video_container_size (dcp::Size); void set_ignore_video (); void set_ignore_audio (); @@ -115,6 +115,7 @@ private: friend struct empty_test2; friend struct check_reuse_old_data_test; + void construct (); void setup_pieces (); void setup_pieces_unlocked (); void flush (); @@ -151,6 +152,7 @@ private: mutable boost::mutex _mutex; boost::shared_ptr<const Film> _film; + /** Playlist, or 0 if we are using the one from the _film */ boost::shared_ptr<const Playlist> _playlist; /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */ |