From c98c87afe29d9ef74bdced8a9c96d7752f3fe80f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 1 May 2014 14:32:45 +0100 Subject: Fix 3D support. --- src/lib/player.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/lib/player.h') diff --git a/src/lib/player.h b/src/lib/player.h index b70bd3f64..9151d20c5 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -32,6 +32,7 @@ #include "content_subtitle.h" #include "position_image.h" #include "piece.h" +#include "content_video.h" class Job; class Film; @@ -104,7 +105,7 @@ class Player : public boost::enable_shared_from_this, public boost::nonc public: Player (boost::shared_ptr, boost::shared_ptr); - boost::shared_ptr get_video (DCPTime time, bool accurate); + std::list > get_video (DCPTime time, bool accurate); boost::shared_ptr get_audio (DCPTime time, DCPTime length, bool accurate); void set_video_container_size (dcp::Size); @@ -135,13 +136,20 @@ private: void film_changed (Film::Property); std::list process_content_image_subtitles ( boost::shared_ptr, std::list > - ); - std::list process_content_text_subtitles (std::list >); + ) const; + std::list process_content_text_subtitles (std::list >) const; void update_subtitle_from_text (); VideoFrame dcp_to_content_video (boost::shared_ptr piece, DCPTime t) const; AudioFrame dcp_to_content_audio (boost::shared_ptr piece, DCPTime t) const; ContentTime dcp_to_content_subtitle (boost::shared_ptr piece, DCPTime t) const; boost::shared_ptr black_dcp_video (DCPTime) const; + boost::shared_ptr content_to_dcp ( + boost::shared_ptr content, + ContentVideo content_video, + std::list > subs, + DCPTime time, + dcp::Size image_size + ) const; /** @return Pieces of content type C that overlap a specified time range in the DCP */ template -- cgit v1.2.3