X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_content.h;h=c3c25232f4893ec59776d42c20f483ec5f72acc1;hb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;hp=cc91a2df82eec046faeb58030bcfa7a2ca7a76e3;hpb=24d54ea7fe1ba128cf8d3521d6738fc73a7c623e;p=dcpomatic.git

diff --git a/src/lib/subtitle_content.h b/src/lib/subtitle_content.h
index cc91a2df8..c3c25232f 100644
--- a/src/lib/subtitle_content.h
+++ b/src/lib/subtitle_content.h
@@ -27,23 +27,40 @@ class SubtitleContentProperty
 public:
 	static int const SUBTITLE_X_OFFSET;
 	static int const SUBTITLE_Y_OFFSET;
-	static int const SUBTITLE_SCALE;
+	static int const SUBTITLE_X_SCALE;
+	static int const SUBTITLE_Y_SCALE;
+	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;
 
-	virtual bool has_subtitle_during (ContentTimePeriod) const = 0;
-	
+	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);
+	void set_subtitle_x_scale (double);
+	void set_subtitle_y_scale (double);
+
+	bool use_subtitles () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _use_subtitles;
+	}
 
 	double subtitle_x_offset () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -55,14 +72,20 @@ public:
 		return _subtitle_y_offset;
 	}
 
-	double subtitle_scale () const {
+	double subtitle_x_scale () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _subtitle_x_scale;
+	}
+
+	double subtitle_y_scale () const {
 		boost::mutex::scoped_lock lm (_mutex);
-		return _subtitle_scale;
+		return _subtitle_y_scale;
 	}
 
 private:
-	friend class ffmpeg_pts_offset_test;
+	friend struct ffmpeg_pts_offset_test;
 
+	bool _use_subtitles;
 	/** x offset for placing subtitles, as a proportion of the container width;
 	 * +ve is further right, -ve is further left.
 	 */
@@ -71,8 +94,10 @@ private:
 	 *  +ve is further down the frame, -ve is further up.
 	 */
 	double _subtitle_y_offset;
-	/** scale factor to apply to subtitles */
-	double _subtitle_scale;
+	/** x scale factor to apply to subtitles */
+	double _subtitle_x_scale;
+	/** y scale factor to apply to subtitles */
+	double _subtitle_y_scale;
 };
 
 #endif