X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=e9cb3dacf911577105be1d91ad7e5e5dcf87cc1d;hb=cef07676fb15c9f1c3c3073d22f06ffe95d9c2ce;hp=b2a492e683e323bb671d3d894faaa913738f2f46;hpb=02478f9f6af48b6209a8e87401025237b7461986;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index b2a492e68..e9cb3dacf 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -23,9 +23,6 @@
 #include "video_content.h"
 #include "audio_content.h"
 #include "subtitle_content.h"
-#include "audio_mapping.h"
-#include <boost/enable_shared_from_this.hpp>
-#include <boost/lexical_cast.hpp>
 
 struct AVFormatContext;
 struct AVStream;
@@ -40,6 +37,7 @@ class FFmpegContentProperty : public VideoContentProperty
 {
 public:
 	static int const SUBTITLE_STREAMS;
+	/** The chosen subtitle stream, or something about it */
 	static int const SUBTITLE_STREAM;
 	static int const FILTERS;
 };
@@ -72,6 +70,9 @@ public:
 	/* SubtitleContent */
 	bool has_text_subtitles () const;
 	bool has_image_subtitles () const;
+	double subtitle_video_frame_rate () const {
+		return video_frame_rate ();
+	}
 
 	void set_filters (std::vector<Filter const *> const &);
 
@@ -102,10 +103,13 @@ public:
 		return _first_video;
 	}
 
-	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+	std::list<ContentTimePeriod> image_subtitles_during (ContentTimePeriod, bool starting) const;
+	std::list<ContentTimePeriod> text_subtitles_during (ContentTimePeriod, bool starting) const;
+
+	void signal_subtitle_stream_changed ();
 
 protected:
-	void add_properties (std::list<std::pair<std::string, std::string> > &) const;
+	void add_properties (std::list<UserProperty> &) const;
 
 private:
 	friend struct ffmpeg_pts_offset_test;
@@ -122,7 +126,7 @@ private:
 	AVColorPrimaries _color_primaries;
 	AVColorTransferCharacteristic _color_trc;
 	AVColorSpace _colorspace;
-	int _bits_per_pixel;
+	boost::optional<int> _bits_per_pixel;
 };
 
 #endif