X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=cd904af0613d5b9aa842e07cdbacad89e4e24466;hb=b733ff51f0212d02dbf33ccb62e67f07941f5ace;hp=7cc00f46bb25f4d45dcfb02afdc9342584ff5916;hpb=14cccb179fff7bbbf422e13f9d2e3264239c93c7;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 7cc00f46b..cd904af06 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -60,7 +60,7 @@ public:
 
 	boost::shared_ptr<PlayerVideo> shallow_copy () const;
 
-	void set_subtitle (PositionImage);
+	void set_text (PositionImage);
 
 	void prepare ();
 	boost::shared_ptr<Image> image (dcp::NoteHandler note, boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
@@ -71,7 +71,7 @@ public:
 	void add_metadata (xmlpp::Node* node) const;
 	void send_binary (boost::shared_ptr<Socket> socket) const;
 
-	void reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size);
+	bool reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size);
 
 	bool has_j2k () const;
 	dcp::Data j2k () const;
@@ -109,7 +109,7 @@ private:
 	Eyes _eyes;
 	Part _part;
 	boost::optional<ColourConversion> _colour_conversion;
-	boost::optional<PositionImage> _subtitle;
+	boost::optional<PositionImage> _text;
 	/** Content that we came from.  This is so that reset_metadata() can work */
 	boost::weak_ptr<Content> _content;
 	/** Video frame that we came from.  Again, this is for reset_metadata() */