More function moves and build fixes; now builds.

[dcpomatic.git] / src / lib / player_video.h

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 0952eafb95ea880d47d9874a62fd1b58ece7820f..65f5111c300e8fc3a2cf5f56a77cfac1e70920ca 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -22,6 +22,7 @@
 #define DCPOMATIC_PLAYER_VIDEO_H
 
 #include "types.h"
+#include "piece.h"
 #include "position.h"
 #include "dcpomatic_time.h"
 #include "colour_conversion.h"
@@ -56,7 +57,7 @@ public:
                Part,
                boost::optional<ColourConversion>,
                VideoRange video_range,
-               boost::weak_ptr<Content>,
+               boost::weak_ptr<Piece>,
                boost::optional<Frame>,
                bool error
                );
@@ -105,8 +106,8 @@ public:
 
        size_t memory_used () const;
 
-       boost::weak_ptr<Content> content () const {
-               return _content;
+       boost::weak_ptr<Piece> piece () const {
+               return _piece;
        }
 
        bool error () const {
@@ -126,8 +127,9 @@ private:
        boost::optional<ColourConversion> _colour_conversion;
        VideoRange _video_range;
        boost::optional<PositionImage> _text;
-       /** Content that we came from.  This is so that reset_metadata() can work. */
-       boost::weak_ptr<Content> _content;
+       /** Piece that we came from.  This is so that reset_metadata() can work. */
+        */
+       boost::weak_ptr<Piece> _piece;
        /** Video frame that we came from.  Again, this is for reset_metadata() */
        boost::optional<Frame> _video_frame;