X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent_video.h;h=8e5f2fd094d408d6433fb012c3a3a35385c9375c;hp=a7f73597c866495b0df60a2f3036bd8066d0f1f0;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=c6c082c4a8016f85ba4207f4b8ccee1d5770e4a4 diff --git a/src/lib/content_video.h b/src/lib/content_video.h index a7f73597c..8e5f2fd09 100644 --- a/src/lib/content_video.h +++ b/src/lib/content_video.h @@ -1,25 +1,28 @@ /* 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 . */ #ifndef DCPOMATIC_CONTENT_VIDEO_H #define DCPOMATIC_CONTENT_VIDEO_H +#include "video_frame.h" + class ImageProxy; /** @class ContentVideo @@ -29,20 +32,18 @@ class ContentVideo { public: ContentVideo () - : eyes (EYES_BOTH) + : part (PART_WHOLE) {} - ContentVideo (boost::shared_ptr i, Eyes e, Part p, VideoFrame f) + ContentVideo (boost::shared_ptr i, VideoFrame f, Part p) : image (i) - , eyes (e) - , part (p) , frame (f) + , part (p) {} - + boost::shared_ptr image; - Eyes eyes; - Part part; VideoFrame frame; + Part part; }; #endif