C++11 tidying.

[dcpomatic.git] / src / lib / image_examiner.h

diff --git a/src/lib/image_examiner.h b/src/lib/image_examiner.h
index f5d5150749971c6f874880802e1da1ff09b96555..cad8683a19b3e23148668f1a97b6eb5bf82ccaf6 100644 (file)
--- a/src/lib/image_examiner.h
+++ b/src/lib/image_examiner.h
@@ -1,44 +1,48 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    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/>.
 
 */
 
 #include "video_examiner.h"
 
-namespace Magick {
-       class Image;
-}
-
 class ImageContent;
 
 class ImageExaminer : public VideoExaminer
 {
 public:
-       ImageExaminer (boost::shared_ptr<const Film>, boost::shared_ptr<const ImageContent>, boost::shared_ptr<Job>);
+       ImageExaminer (std::shared_ptr<const Film>, std::shared_ptr<const ImageContent>, std::shared_ptr<Job>);
 
-       float video_frame_rate () const;
-       libdcp::Size video_size () const;
-       VideoFrame video_length () const {
+       bool has_video () const {
+               return true;
+       }
+       boost::optional<double> video_frame_rate () const;
+       dcp::Size video_size () const;
+       Frame video_length () const {
                return _video_length;
        }
+       bool yuv () const;
+       VideoRange range () const {
+               return VideoRange::FULL;
+       }
 
 private:
-       boost::weak_ptr<const Film> _film;
-       boost::shared_ptr<const ImageContent> _image_content;
-       boost::optional<libdcp::Size> _video_size;
-       VideoFrame _video_length;
+       std::weak_ptr<const Film> _film;
+       std::shared_ptr<const ImageContent> _image_content;
+       boost::optional<dcp::Size> _video_size;
+       Frame _video_length;
 };