X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.h;h=57f5eb9509264d68957ac8f99ef282932cbb28f9;hb=d2137ac5db409e686b4d9b3fa567935a5e416d41;hp=b73119bdb9dccef91e87e516f3b1c475da3fdfda;hpb=e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3;p=dcpomatic.git

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index b73119bdb..57f5eb950 100644
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -28,26 +28,36 @@ public:
 	static int const SUBTITLE_X_OFFSET;
 	static int const SUBTITLE_Y_OFFSET;
 	static int const SUBTITLE_SCALE;
-	static int const SUBTITLE_USE;
+	static int const USE_SUBTITLES;
 };
 
+/** @class SubtitleContent
+ *  @brief Parent for content which has the potential to include subtitles.
+ *
+ *  Although inheriting from this class indicates that the content could
+ *  have subtitles, it may not.  ::has_subtitles() will tell you.
+ */
 class SubtitleContent : public virtual Content
 {
 public:
+	SubtitleContent (boost::shared_ptr<const Film>);
 	SubtitleContent (boost::shared_ptr<const Film>, boost::filesystem::path);
 	SubtitleContent (boost::shared_ptr<const Film>, cxml::ConstNodePtr, int version);
 	SubtitleContent (boost::shared_ptr<const Film>, std::vector<boost::shared_ptr<Content> >);
 
 	void as_xml (xmlpp::Node *) const;
+	std::string identifier () const;
 
-	void set_subtitle_use (bool);
+	virtual bool has_subtitles () const = 0;
+
+	void set_use_subtitles (bool);
 	void set_subtitle_x_offset (double);
 	void set_subtitle_y_offset (double);
 	void set_subtitle_scale (double);
 
-	bool subtitle_use () const {
+	bool use_subtitles () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _subtitle_use;
+		return _use_subtitles;
 	}
 
 	double subtitle_x_offset () const {
@@ -68,7 +78,7 @@ public:
 private:
 	friend class ffmpeg_pts_offset_test;
 
-	bool _subtitle_use;
+	bool _use_subtitles;
 	/** x offset for placing subtitles, as a proportion of the container width;
 	 * +ve is further right, -ve is further left.
 	 */