X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fobject.h;h=0132a0db12c3cec2ba38999ac8a8248135b07418;hb=d3598922d970bba6fcb468c331e1f0a33bef1a0f;hp=636c76a04ed3b233d3a253718ca870459716ca4b;hpb=1c724e363a644abaee7efb39d6091e7b30de0fb6;p=libdcp.git

diff --git a/src/object.h b/src/object.h
index 636c76a0..0132a0db 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1,45 +1,82 @@
 /*
     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
+ *  @brief Object class.
+ */
+
 #ifndef LIBDCP_OBJECT_H
 #define LIBDCP_OBJECT_H
 
+#include <boost/noncopyable.hpp>
 #include <string>
 
+struct write_interop_subtitle_test;
+struct write_interop_subtitle_test2;
+struct write_interop_subtitle_test3;
+struct write_smpte_subtitle_test;
+struct write_smpte_subtitle_test2;
+struct write_smpte_subtitle_test3;
+
 namespace dcp {
 
-/** Some part of a DCP that has a UUID */
-class Object
+/** @class Object
+ *  @brief Some part of a DCP that has a UUID.
+ */
+class Object : public boost::noncopyable
 {
 public:
 	Object ();
-	Object (std::string id);
+	explicit Object (std::string id);
 	virtual ~Object () {}
 
+	/** @return ID */
 	std::string id () const {
 		return _id;
 	}
 
 protected:
+	friend struct ::write_interop_subtitle_test;
+	friend struct ::write_interop_subtitle_test2;
+	friend struct ::write_interop_subtitle_test3;
+	friend struct ::write_smpte_subtitle_test;
+	friend struct ::write_smpte_subtitle_test2;
+	friend struct ::write_smpte_subtitle_test3;
+
+	/** ID */
 	std::string _id;
 };
-	
+
 }
 
 #endif