X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fobject.cc;h=08268f1815a17469256f05e0d3015bba5a87350e;hb=9486066c29b91a8d9ac25be1c596cad62387208f;hp=e9a4f62b9a40e7c2c2f0c0d27a475bac9872e92b;hpb=0703842433013ac1d5f79c09d7a8361dc2e565c8;p=libdcp.git

diff --git a/src/object.cc b/src/object.cc
index e9a4f62b..08268f18 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -1,36 +1,59 @@
 /*
     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.cc
+ *  @brief Object class.
+ */
+
 #include "object.h"
+#include "dcp_assert.h"
 #include "util.h"
 
 using std::string;
 using namespace dcp;
 
+/** Create an Object with a random ID. */
 Object::Object ()
 	: _id (make_uuid ())
 {
 
 }
 
+/** Create an Object with a given ID.
+ *  @param id ID to use.
+ */
 Object::Object (string id)
 	: _id (id)
 {
-
+	DCP_ASSERT (_id.substr(0, 9) != "urn:uuid:");
 }