X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_video.h;h=f59e99cfc65cd25cbbe57552a17648841c06527c;hb=d66bcea066deb3b3cd919a69aab7e2078fb52ca8;hp=c8f5cca0b9c29b708b3ab5fb64e81b44845554dc;hpb=0a20f4b0ee59f06732648f981fe4d3e387b5705a;p=dcpomatic.git diff --git a/src/lib/content_video.h b/src/lib/content_video.h index c8f5cca0b..f59e99cfc 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 . */ @@ -29,22 +30,22 @@ class ContentVideo { public: ContentVideo () - : eyes (EYES_BOTH) + : frame (0) + , eyes (EYES_LEFT) , part (PART_WHOLE) - , frame (0) {} - ContentVideo (boost::shared_ptr i, Eyes e, Part p, Frame f) + ContentVideo (boost::shared_ptr i, Frame f, Eyes e, Part p) : image (i) + , frame (f) , eyes (e) , part (p) - , frame (f) {} - + boost::shared_ptr image; + Frame frame; Eyes eyes; Part part; - Frame frame; }; #endif