Merge master.

[dcpomatic.git] / src / lib / content_factory.h

diff --git a/src/lib/content_factory.h b/src/lib/content_factory.h
index 93fd98d8346b3902c63e867eff1dfe5b50de0d39..fae7648eabfa8910baa7157a695cca1035dba2cc 100644 (file)
--- a/src/lib/content_factory.h
+++ b/src/lib/content_factory.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,11 @@
 
 */
 
+/** @file  src/lib/content_factory.h
+ *  @brief Methods to create content objects.
+ */
+
 class Film;
 
-extern boost::shared_ptr<Content> content_factory (boost::shared_ptr<const Film>, boost::shared_ptr<cxml::Node>);
+extern boost::shared_ptr<Content> content_factory (boost::shared_ptr<const Film>, cxml::NodePtr, int, std::list<std::string> &);
 extern boost::shared_ptr<Content> content_factory (boost::shared_ptr<const Film>, boost::filesystem::path);