diff options
Diffstat (limited to 'src/lib/player_video.h')
| -rw-r--r-- | src/lib/player_video.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 6cb8a3140..19cf2fb39 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -56,7 +56,6 @@ public: Part, boost::optional<ColourConversion>, VideoRange video_range, - boost::weak_ptr<Content>, boost::optional<dcpomatic::DCPTime>, int video_frame_rate ); @@ -76,7 +75,7 @@ public: void add_metadata (xmlpp::Node* node) const; void send_binary (boost::shared_ptr<Socket> socket) const; - bool reset_metadata (dcp::Size video_container_size); + void reset_metadata (dcp::Size video_container_size); bool has_j2k () const; dcp::Data j2k () const; @@ -105,10 +104,6 @@ public: size_t memory_used () const; - boost::weak_ptr<Content> content () const { - return _content; - } - private: void make_image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const; @@ -122,10 +117,6 @@ private: boost::optional<ColourConversion> _colour_conversion; VideoRange _video_range; std::list<PlayerText> _text; - /** Content that we came from. This is so that reset_metadata() can work, and also - * for variant:swaroop's non-skippable ads. - */ - boost::weak_ptr<Content> _content; boost::optional<dcpomatic::DCPTime> _time; int _video_frame_rate; |