X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fobject.h;h=508170510fc133055f7ee8761bf09ffaf26b7b38;hb=bc726e825c8175999bf89a0c1936b97e4479a3dd;hp=82598c589a1106c183fdbdaba6bbeb75e6f25170;hpb=2f0e6ee9d883abbbc31aca0d1cc80e89eb9b0af2;p=libdcp.git

diff --git a/src/object.h b/src/object.h
index 82598c58..50817051 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2014 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/object.h
@@ -27,6 +41,11 @@
 #include <boost/noncopyable.hpp>
 #include <string>
 
+class write_interop_subtitle_test;
+class write_interop_subtitle_test2;
+class write_smpte_subtitle_test;
+class write_smpte_subtitle_test2;
+
 namespace dcp {
 
 /** @class Object
@@ -36,7 +55,7 @@ class Object : public boost::noncopyable
 {
 public:
 	Object ();
-	Object (std::string id);
+	explicit Object (std::string id);
 	virtual ~Object () {}
 
 	/** @return ID */
@@ -45,10 +64,15 @@ public:
 	}
 
 protected:
+	friend struct ::write_interop_subtitle_test;
+	friend struct ::write_interop_subtitle_test2;
+	friend struct ::write_smpte_subtitle_test;
+	friend struct ::write_smpte_subtitle_test2;
+
 	/** ID */
 	std::string _id;
 };
-	
+
 }
 
 #endif