X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fdcp_examiner.h;h=6fc041cc6a9713bcf1bc0a3926a6dffda1e1c9e0;hp=03d43d0f6c9f7a270ab2f2b16d147c4389ec289d;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=e80e6a8567dd107f5ea3b708975cb5fd92112a57

diff --git a/src/lib/dcp_examiner.h b/src/lib/dcp_examiner.h
index 03d43d0f6..6fc041cc6 100644
--- a/src/lib/dcp_examiner.h
+++ b/src/lib/dcp_examiner.h
@@ -1,22 +1,27 @@
 /*
     Copyright (C) 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/>.
 
 */
 
+/** @file  src/lib/dcp_examiner.h
+ *  @brief DCPExaminer class.
+ */
+
 #include "video_examiner.h"
 #include "audio_examiner.h"
 
@@ -26,19 +31,23 @@ class DCPExaminer : public VideoExaminer, public AudioExaminer
 {
 public:
 	DCPExaminer (boost::shared_ptr<const DCPContent>);
-	
-	float video_frame_rate () const {
-		return _video_frame_rate.get_value_or (24);
+
+	boost::optional<double> video_frame_rate () const {
+		return _video_frame_rate;
 	}
-	
+
 	dcp::Size video_size () const {
 		return _video_size.get_value_or (dcp::Size (1998, 1080));
 	}
-	
-	ContentTime video_length () const {
+
+	Frame video_length () const {
 		return _video_length;
 	}
 
+	bool yuv () const {
+		return false;
+	}
+
 	std::string name () const {
 		return _name;
 	}
@@ -54,11 +63,11 @@ public:
 	int audio_channels () const {
 		return _audio_channels.get_value_or (0);
 	}
-	
-	ContentTime audio_length () const {
+
+	Frame audio_length () const {
 		return _audio_length;
 	}
-	
+
 	int audio_frame_rate () const {
 		return _audio_frame_rate.get_value_or (48000);
 	}
@@ -67,15 +76,25 @@ public:
 		return _kdm_valid;
 	}
 
+	boost::optional<dcp::Standard> standard () const {
+		return _standard;
+	}
+
+	bool three_d () const {
+		return _three_d;
+	}
+
 private:
-	boost::optional<float> _video_frame_rate;
+	boost::optional<double> _video_frame_rate;
 	boost::optional<dcp::Size> _video_size;
-	ContentTime _video_length;
+	Frame _video_length;
 	boost::optional<int> _audio_channels;
 	boost::optional<int> _audio_frame_rate;
-	ContentTime _audio_length;
+	Frame _audio_length;
 	std::string _name;
 	bool _has_subtitles;
 	bool _encrypted;
 	bool _kdm_valid;
+	boost::optional<dcp::Standard> _standard;
+	bool _three_d;
 };