X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fffmpeg_content.h;h=f5bbbd31e27654ae1d5da742842ab0d07af4fd50;hb=36774ee2b48f0bfde43b743592e5816ff58bb7d2;hp=05f6cebb6ff2f168f5cbfb30e6e7fee242f02974;hpb=fe771b1f0ed9f794bc98faa4cca2a15651f28e87;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 05f6cebb6..f5bbbd31e 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -20,12 +20,8 @@
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#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;
@@ -33,18 +29,20 @@ struct AVStream;
 class Filter;
 class FFmpegSubtitleStream;
 class FFmpegAudioStream;
+class VideoContent;
 struct ffmpeg_pts_offset_test;
 struct audio_sampling_rate_test;
 
-class FFmpegContentProperty : public VideoContentProperty
+class FFmpegContentProperty
 {
 public:
 	static int const SUBTITLE_STREAMS;
+	/** The chosen subtitle stream, or something about it */
 	static int const SUBTITLE_STREAM;
 	static int const FILTERS;
 };
 
-class FFmpegContent : public VideoContent, public AudioContent, public SubtitleContent
+class FFmpegContent : public AudioContent, public SubtitleContent
 {
 public:
 	FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -72,6 +70,7 @@ public:
 	/* SubtitleContent */
 	bool has_text_subtitles () const;
 	bool has_image_subtitles () const;
+	double subtitle_video_frame_rate () const;
 
 	void set_filters (std::vector<Filter const *> const &);
 
@@ -102,10 +101,15 @@ 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 ();
+
+	boost::shared_ptr<VideoContent> video;
 
 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,6 +126,7 @@ private:
 	AVColorPrimaries _color_primaries;
 	AVColorTransferCharacteristic _color_trc;
 	AVColorSpace _colorspace;
+	boost::optional<int> _bits_per_pixel;
 };
 
 #endif