X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Finterop_subtitle_asset.h;h=72cd0022445e69b9fffa443df9ce6c30525b5233;hb=d4b350cc524543b8142ac803232b31af751885e2;hp=8690d11c3b82205b41e83291c3327012e32d1d9b;hpb=81312913ad26aaee12eeabd3f27a537806c97049;p=libdcp.git

diff --git a/src/interop_subtitle_asset.h b/src/interop_subtitle_asset.h
index 8690d11c..72cd0022 100644
--- a/src/interop_subtitle_asset.h
+++ b/src/interop_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/interop_subtitle_asset.h
@@ -37,7 +51,7 @@ class InteropSubtitleAsset : public SubtitleAsset
 {
 public:
 	InteropSubtitleAsset ();
-	InteropSubtitleAsset (boost::filesystem::path file);
+	explicit InteropSubtitleAsset (boost::filesystem::path file);
 
 	bool equals (
 		boost::shared_ptr<const Asset>,
@@ -49,9 +63,9 @@ public:
 
 	void add_font (std::string load_id, boost::filesystem::path file);
 
-	Glib::ustring xml_as_string () const;
+	std::string xml_as_string () const;
 	void write (boost::filesystem::path path) const;
-	void resolve_fonts (std::list<boost::shared_ptr<Object> > objects);
+	void resolve_fonts (std::list<boost::shared_ptr<Asset> > assets);
 	void add_font_assets (std::list<boost::shared_ptr<Asset> >& assets);
 
 	/** Set the reel number or sub-element identifier
@@ -94,7 +108,7 @@ public:
 protected:
 
 	std::string pkl_type (Standard) const {
-		return "text/xml";
+		return "text/xml;asdcpKind=Subtitle";
 	}
 
 private: