X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=d2e164f1d5352e4ce844b7e4dbaa5dfa4f783f5f;hb=35992b8f2c9d58a08d1ecb08a39d7c99362fd2c0;hp=5437c5bf35f04450ca9b2aeeabecb81044a7273a;hpb=338aa9db0d82ceccde67e4b3dff0bfb75d2a4648;p=dcpomatic.git

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index 5437c5bf3..d2e164f1d 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -1,28 +1,28 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #ifndef DCPOMATIC_FFMPEG_CONTENT_H
 #define DCPOMATIC_FFMPEG_CONTENT_H
 
-#include "video_content.h"
-#include "audio_content.h"
-#include "subtitle_content.h"
+#include "content.h"
+#include "audio_stream.h"
 
 struct AVFormatContext;
 struct AVStream;
@@ -30,18 +30,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 Content
 {
 public:
 	FFmpegContent (boost::shared_ptr<const Film>, boost::filesystem::path);
@@ -53,26 +55,16 @@ public:
 	}
 
 	void examine (boost::shared_ptr<Job>);
+	void take_settings_from (boost::shared_ptr<const Content> c);
 	std::string summary () const;
 	std::string technical_summary () const;
-	void as_xml (xmlpp::Node *) const;
+	void as_xml (xmlpp::Node *, bool with_paths) const;
 	DCPTime full_length () const;
 
 	std::string identifier () const;
 
-	/* VideoContent */
 	void set_default_colour_conversion ();
 
-	/* AudioContent */
-	std::vector<AudioStreamPtr> audio_streams () const;
-
-	/* 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 &);
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
@@ -85,10 +77,7 @@ public:
 		return _subtitle_stream;
 	}
 
-	std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const {
-		boost::mutex::scoped_lock lm (_mutex);
-		return _audio_streams;
-	}
+	std::vector<boost::shared_ptr<FFmpegAudioStream> > ffmpeg_audio_streams () const;
 
 	std::vector<Filter const *> filters () const {
 		boost::mutex::scoped_lock lm (_mutex);
@@ -102,27 +91,37 @@ public:
 		return _first_video;
 	}
 
-	std::list<ContentTimePeriod> subtitles_during (ContentTimePeriod, bool starting) const;
+	void signal_subtitle_stream_changed ();
 
-protected:
-	void add_properties (std::list<std::pair<std::string, std::string> > &) const;
+	boost::optional<std::string> decryption_key () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _decryption_key;
+	}
+
+	bool encrypted () const {
+		boost::mutex::scoped_lock lm (_mutex);
+		return _encrypted;
+	}
 
 private:
+	void add_properties (std::list<UserProperty> &) const;
+
 	friend struct ffmpeg_pts_offset_test;
 	friend struct audio_sampling_rate_test;
 
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
 	boost::shared_ptr<FFmpegSubtitleStream> _subtitle_stream;
-	std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
 	boost::optional<ContentTime> _first_video;
 	/** Video filters that should be used when generating DCPs */
 	std::vector<Filter const *> _filters;
 
-	AVColorRange _color_range;
-	AVColorPrimaries _color_primaries;
-	AVColorTransferCharacteristic _color_trc;
-	AVColorSpace _colorspace;
+	boost::optional<AVColorRange> _color_range;
+	boost::optional<AVColorPrimaries> _color_primaries;
+	boost::optional<AVColorTransferCharacteristic> _color_trc;
+	boost::optional<AVColorSpace> _colorspace;
 	boost::optional<int> _bits_per_pixel;
+	boost::optional<std::string> _decryption_key;
+	bool _encrypted;
 };
 
 #endif