X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcontent_video.h;h=8ca18576e4e939f9c7b469924b6f5e63e89a8d10;hp=4c0bdb655d7ea222bef72e6d2b454e725d72ffd7;hb=2d4e8c5f69cc694625ad95dcee554499605f823b;hpb=bfe277e664a03ec47cd6bee7e1b1e4aca6eb38e6

diff --git a/src/lib/content_video.h b/src/lib/content_video.h
index 4c0bdb655..8ca18576e 100644
--- a/src/lib/content_video.h
+++ b/src/lib/content_video.h
@@ -1,25 +1,28 @@
 /*
     Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
 #ifndef DCPOMATIC_CONTENT_VIDEO_H
 #define DCPOMATIC_CONTENT_VIDEO_H
 
+#include "types.h"
+
 class ImageProxy;
 
 /** @class ContentVideo
@@ -29,21 +32,22 @@ class ContentVideo
 {
 public:
 	ContentVideo ()
-		: eyes (EYES_BOTH)
-		, part (PART_WHOLE)
+		: frame (0)
+		, eyes (Eyes::LEFT)
+		, part (Part::WHOLE)
 	{}
 
-	ContentVideo (boost::shared_ptr<const ImageProxy> i, Eyes e, Part p, VideoFrame f)
+	ContentVideo (std::shared_ptr<const ImageProxy> i, Frame f, Eyes e, Part p)
 		: image (i)
+		, frame (f)
 		, eyes (e)
 		, part (p)
-		, frame (f)
 	{}
-	
-	boost::shared_ptr<const ImageProxy> image;
+
+	std::shared_ptr<const ImageProxy> image;
+	Frame frame;
 	Eyes eyes;
 	Part part;
-	VideoFrame frame;
 };
 
 #endif