X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_part.h;h=d3b9b310d97747a31af4fe3ebfafb02a03df50a3;hb=58b5c57c9a4767c786a1428f243c60ff52c82c26;hp=dbc5232395bed3c49b8db3215b19b644df55b3cb;hpb=7749e3cc9ac7b51c2a77ee4f2c3c99e381747716;p=dcpomatic.git diff --git a/src/lib/content_part.h b/src/lib/content_part.h index dbc523239..d3b9b310d 100644 --- a/src/lib/content_part.h +++ b/src/lib/content_part.h @@ -1,19 +1,20 @@ /* Copyright (C) 2016 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 . */ @@ -30,9 +31,8 @@ class Film; class ContentPart { public: - ContentPart (Content* parent, boost::shared_ptr film) + ContentPart (Content* parent) : _parent (parent) - , _film (film) {} protected: @@ -65,7 +65,6 @@ protected: } Content* _parent; - boost::weak_ptr _film; mutable boost::mutex _mutex; };