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

diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h
index b11486bf1..d2e164f1d 100644
--- a/src/lib/ffmpeg_content.h
+++ b/src/lib/ffmpeg_content.h
@@ -1,19 +1,20 @@
 /*
     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/>.
 
 */
 
@@ -54,9 +55,10 @@ 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;
@@ -65,8 +67,6 @@ public:
 
 	void set_filters (std::vector<Filter const *> const &);
 
-	void changed (int property);
-
 	std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _subtitle_streams;
@@ -91,11 +91,18 @@ public:
 		return _first_video;
 	}
 
-	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::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;
 
@@ -108,11 +115,13 @@ private:
 	/** 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