X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_video.h;h=8e5f2fd094d408d6433fb012c3a3a35385c9375c;hb=3dd6717ebb8766fd9ca2a9983e9d0bed69312d1e;hp=c8f5cca0b9c29b708b3ab5fb64e81b44845554dc;hpb=0a20f4b0ee59f06732648f981fe4d3e387b5705a;p=dcpomatic.git

diff --git a/src/lib/content_video.h b/src/lib/content_video.h
index c8f5cca0b..8e5f2fd09 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 "video_frame.h"
+
 class ImageProxy;
 
 /** @class ContentVideo
@@ -29,22 +32,18 @@ class ContentVideo
 {
 public:
 	ContentVideo ()
-		: eyes (EYES_BOTH)
-		, part (PART_WHOLE)
-		, frame (0)
+		: part (PART_WHOLE)
 	{}
 
-	ContentVideo (boost::shared_ptr<const ImageProxy> i, Eyes e, Part p, Frame f)
+	ContentVideo (boost::shared_ptr<const ImageProxy> i, VideoFrame f, Part p)
 		: image (i)
-		, eyes (e)
-		, part (p)
 		, frame (f)
+		, part (p)
 	{}
-	
+
 	boost::shared_ptr<const ImageProxy> image;
-	Eyes eyes;
+	VideoFrame frame;
 	Part part;
-	Frame frame;
 };
 
 #endif