X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent_video.h;h=1c145f60294f4e7d1e1523cd8cf3abbe16eb12e5;hb=2b0cad926f8206390db09a659f6d63341a912871;hp=2c996f816650de6651463c3b33887d765b880aa9;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git

diff --git a/src/lib/content_video.h b/src/lib/content_video.h
index 2c996f816..1c145f602 100644
--- a/src/lib/content_video.h
+++ b/src/lib/content_video.h
@@ -1,27 +1,35 @@
 /*
     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 "dcpomatic_time.h"
+#include "types.h"
+
+
 class ImageProxy;
 
+
 /** @class ContentVideo
  *  @brief A frame of video straight out of some content.
  */
@@ -29,22 +37,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, Frame f)
+	ContentVideo (std::shared_ptr<const ImageProxy> i, dcpomatic::ContentTime t, Eyes e, Part p)
 		: image (i)
+		, time (t)
 		, eyes (e)
 		, part (p)
-		, frame (f)
 	{}
 
-	boost::shared_ptr<const ImageProxy> image;
+	std::shared_ptr<const ImageProxy> image;
+	dcpomatic::ContentTime time;
 	Eyes eyes;
 	Part part;
-	Frame frame;
 };
 
+
 #endif