diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-04-25 23:03:30 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-04-25 23:03:30 +0100 |
| commit | d19ba00f1995495977bdee206305c42a96eb0f57 (patch) | |
| tree | 3b64d763644b2df5a46580b817de8edf5b5beef3 /src/lib/player.h | |
| parent | 9680643eaa6efeff281fdbe47441d4387804b3ee (diff) | |
Put Piece class in its own file.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index f7896d7d9..4368f48ba 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -29,6 +29,7 @@ #include "rect.h" #include "audio_merger.h" #include "audio_content.h" +#include "piece.h" class Job; class Film; @@ -38,21 +39,6 @@ class Piece; class Image; class Resampler; -/** @class Player - * @brief A class which can `play' a Playlist; emitting its audio and video. - */ - -struct IncomingVideo -{ -public: - boost::weak_ptr<Piece> weak_piece; - boost::shared_ptr<const Image> image; - Eyes eyes; - bool same; - VideoContent::Frame frame; - Time extra; -}; - /** A wrapper for an Image which contains some pending operations; these may * not be necessary if the receiver of the PlayerImage throws it away. */ @@ -75,6 +61,9 @@ private: Position<int> _subtitle_position; }; +/** @class Player + * @brief A class which can `play' a Playlist; emitting its audio and video. + */ class Player : public boost::enable_shared_from_this<Player>, public boost::noncopyable { public: |
