projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply d3bc61f0af33fedf02ac1a28cf91989ee9cd2fb6 from master;
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.h
diff --git
a/src/lib/dcp_examiner.h
b/src/lib/dcp_examiner.h
index 5b510743b73c8ce8ba2a876c84e8fe5ae4d71b11..ef780dc3e9876d124493109315f5e1b3a9214bfd 100644
(file)
--- a/
src/lib/dcp_examiner.h
+++ b/
src/lib/dcp_examiner.h
@@
-27,8
+27,8
@@
class DCPExaminer : public VideoExaminer, public AudioExaminer
public:
DCPExaminer (boost::shared_ptr<const DCPContent>);
public:
DCPExaminer (boost::shared_ptr<const DCPContent>);
-
float
video_frame_rate () const {
- return _video_frame_rate
.get_value_or (24)
;
+
boost::optional<float>
video_frame_rate () const {
+ return _video_frame_rate;
}
dcp::Size video_size () const {
}
dcp::Size video_size () const {
@@
-47,6
+47,10
@@
public:
return _has_subtitles;
}
return _has_subtitles;
}
+ bool encrypted () const {
+ return _encrypted;
+ }
+
int audio_channels () const {
return _audio_channels.get_value_or (0);
}
int audio_channels () const {
return _audio_channels.get_value_or (0);
}
@@
-59,6
+63,10
@@
public:
return _audio_frame_rate.get_value_or (48000);
}
return _audio_frame_rate.get_value_or (48000);
}
+ bool kdm_valid () const {
+ return _kdm_valid;
+ }
+
private:
boost::optional<float> _video_frame_rate;
boost::optional<dcp::Size> _video_size;
private:
boost::optional<float> _video_frame_rate;
boost::optional<dcp::Size> _video_size;
@@
-68,4
+76,6
@@
private:
ContentTime _audio_length;
std::string _name;
bool _has_subtitles;
ContentTime _audio_length;
std::string _name;
bool _has_subtitles;
+ bool _encrypted;
+ bool _kdm_valid;
};
};