X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_video.h;h=21a600709e9076e802c944c366a6fe9bbb68f54b;hb=3828baf56467224f5d44049bf1e7a7ed11f43a05;hp=a7f73597c866495b0df60a2f3036bd8066d0f1f0;hpb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;p=dcpomatic.git diff --git a/src/lib/content_video.h b/src/lib/content_video.h index a7f73597c..21a600709 100644 --- a/src/lib/content_video.h +++ b/src/lib/content_video.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 . */ @@ -30,19 +31,21 @@ class ContentVideo public: ContentVideo () : eyes (EYES_BOTH) + , part (PART_WHOLE) + , frame (0) {} - ContentVideo (boost::shared_ptr i, Eyes e, Part p, VideoFrame f) + ContentVideo (boost::shared_ptr i, Eyes e, Part p, Frame f) : image (i) , eyes (e) , part (p) , frame (f) {} - + boost::shared_ptr image; Eyes eyes; Part part; - VideoFrame frame; + Frame frame; }; #endif