X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsmpte_subtitle_asset.h;h=e5ac5e968c55ba3e421b92f23c2de2b50e994f5c;hb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;hp=6862ed114f017055d2959facd0ccef227c78014c;hpb=6268703ea69149150a9b78381490463bc4822f92;p=libdcp.git

diff --git a/src/smpte_subtitle_asset.h b/src/smpte_subtitle_asset.h
index 6862ed11..e5ac5e96 100644
--- a/src/smpte_subtitle_asset.h
+++ b/src/smpte_subtitle_asset.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/smpte_subtitle_asset.h
@@ -46,7 +60,7 @@ public:
 
 	/** @param file File name
 	 */
-	SMPTESubtitleAsset (boost::filesystem::path file);
+	explicit SMPTESubtitleAsset (boost::filesystem::path file);
 
 	bool equals (
 		boost::shared_ptr<const Asset>,
@@ -56,8 +70,9 @@ public:
 
 	std::list<boost::shared_ptr<LoadFontNode> > load_font_nodes () const;
 
-	Glib::ustring xml_as_string () const;
+	std::string xml_as_string () const;
 	void write (boost::filesystem::path path) const;
+	void add (SubtitleString);
 	void add_font (std::string id, boost::filesystem::path file);
 
 	void set_content_title_text (std::string t) {
@@ -68,6 +83,10 @@ public:
 		_language = l;
 	}
 
+	void set_issue_date (LocalTime t) {
+		_issue_date = t;
+	}
+
 	void set_reel_number (int r) {
 		_reel_number = r;
 	}
@@ -84,6 +103,10 @@ public:
 		_start_time = t;
 	}
 
+	void set_intrinsic_duration (int64_t d) {
+		_intrinsic_duration = d;
+	}
+
 	/** @return title of the film that these subtitles are for,
 	 *  to be presented to the user.
 	 */
@@ -137,6 +160,10 @@ protected:
 private:
 	void read_fonts (boost::shared_ptr<ASDCP::TimedText::MXFReader>);
 
+	/** The total length of this content in video frames.  The amount of
+	 *  content presented may be less than this.
+	 */
+	int64_t _intrinsic_duration;
 	std::string _content_title_text;
 	boost::optional<std::string> _language;
 	boost::optional<std::string> _annotation_text;