diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-17 16:05:42 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-17 16:05:42 +0100 |
| commit | c13757391e75cdde7a9cef947c921b7a9ad08003 (patch) | |
| tree | 6a54bcf79031f776c255496a2d94728c88da57b8 /src/lib/player.h | |
| parent | fc7e80f0808b3729b4ef111b1a19214b0d3c5014 (diff) | |
Hence Player does not need Playlist.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index a9504ba05..e515fced3 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -20,7 +20,6 @@ #ifndef DCPOMATIC_PLAYER_H #define DCPOMATIC_PLAYER_H -#include "playlist.h" #include "content.h" #include "film.h" #include "rect.h" @@ -37,7 +36,6 @@ class Job; class Film; -class Playlist; class AudioContent; class Piece; class Image; @@ -45,6 +43,7 @@ class Decoder; class Resampler; class PlayerVideo; class ImageProxy; +class Font; class PlayerStatistics { @@ -79,12 +78,12 @@ public: }; /** @class Player - * @brief A class which can `play' a Playlist. + * @brief A class which can `play' a Film. */ class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable { public: - Player (boost::shared_ptr<const Film>, boost::shared_ptr<const Playlist>); + Player (boost::shared_ptr<const Film>); std::list<boost::shared_ptr<PlayerVideo> > get_video (DCPTime time, bool accurate); boost::shared_ptr<AudioBuffers> get_audio (DCPTime time, DCPTime length, bool accurate); @@ -147,7 +146,6 @@ private: } boost::shared_ptr<const Film> _film; - boost::shared_ptr<const Playlist> _playlist; /** Our pieces are ready to go; if this is false the pieces must be (re-)created before they are used */ bool _have_valid_pieces; |
