X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_factory.h;h=9c090c690e3f2bc2ebf31442246723c9e0d5830f;hb=1b18ea4593c469e9f856f9a0909dcc4cdfad7274;hp=fae7648eabfa8910baa7157a695cca1035dba2cc;hpb=05654d0e1799746a9df3ccab040c92e0ed825cac;p=dcpomatic.git diff --git a/src/lib/content_factory.h b/src/lib/content_factory.h index fae7648ea..9c090c690 100644 --- a/src/lib/content_factory.h +++ b/src/lib/content_factory.h @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2014 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic 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, + DCP-o-matic 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 DCP-o-matic. If not, see . */ @@ -21,7 +22,11 @@ * @brief Methods to create content objects. */ +#include +#include + class Film; +class Content; extern boost::shared_ptr content_factory (boost::shared_ptr, cxml::NodePtr, int, std::list &); -extern boost::shared_ptr content_factory (boost::shared_ptr, boost::filesystem::path); +extern std::list > content_factory (boost::shared_ptr, boost::filesystem::path);