diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-09-04 00:39:39 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-09-04 00:39:39 +0100 |
| commit | 1938b1b08d38fc199717d1875a61ef05e5b965de (patch) | |
| tree | 3734257f39ea97983c7dc49425ae6d51a596215c /src/lib/player.h | |
| parent | a45dd41c4dc7b95b1e3e79640e965ae663e7e680 (diff) | |
Build Empty objects from the presence or absence of decoders in
Pieces, rather than the presence or absence of content. This seems better
because of cases like encrypted DCPs without a a KDM: here we may have content
but no decoder.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 95547f61c..b3c4e82b4 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -90,9 +90,6 @@ public: boost::signals2::signal<void (ChangeType, int, bool)> Change; - /** The change suggested by a MayChange did not happen */ - boost::signals2::signal<void ()> NotChanged; - /** Emitted when a video frame is ready. These emissions happen in the correct order. */ boost::signals2::signal<void (boost::shared_ptr<PlayerVideo>, DCPTime)> Video; boost::signals2::signal<void (boost::shared_ptr<AudioBuffers>, DCPTime)> Audio; @@ -108,6 +105,8 @@ private: friend struct player_time_calculation_test2; friend struct player_time_calculation_test3; friend struct player_subframe_test; + friend struct empty_test1; + friend struct empty_test2; void setup_pieces (); void setup_pieces_unlocked (); @@ -146,7 +145,7 @@ private: boost::shared_ptr<const Film> _film; boost::shared_ptr<const Playlist> _playlist; - /** true if we are suspended (i.e. pass() and seek() do nothing */ + /** true if we are suspended (i.e. pass() and seek() do nothing) */ bool _suspended; std::list<boost::shared_ptr<Piece> > _pieces; |