projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting/C++11.
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.h
diff --git
a/src/lib/dcp_examiner.h
b/src/lib/dcp_examiner.h
index b4c87596c70e354079937132d289a06ed2ba8a42..3fedaca06aded36f75f4beacd85de8ef2fd954ee 100644
(file)
--- a/
src/lib/dcp_examiner.h
+++ b/
src/lib/dcp_examiner.h
@@
-25,6
+25,8
@@
#include "video_examiner.h"
#include "audio_examiner.h"
#include "dcp.h"
#include "video_examiner.h"
#include "audio_examiner.h"
#include "dcp.h"
+#include "dcp_text_track.h"
+#include "dcpomatic_assert.h"
#include <dcp/dcp_time.h>
class DCPContent;
#include <dcp/dcp_time.h>
class DCPContent;
@@
-32,7
+34,7
@@
class DCPContent;
class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
{
public:
class DCPExaminer : public DCP, public VideoExaminer, public AudioExaminer
{
public:
- explicit DCPExaminer (
boost
::shared_ptr<const DCPContent>, bool tolerant);
+ explicit DCPExaminer (
std
::shared_ptr<const DCPContent>, bool tolerant);
bool has_video () const {
return _has_video;
bool has_video () const {
return _has_video;
@@
-57,7
+59,7
@@
public:
}
VideoRange range () const {
}
VideoRange range () const {
- return V
IDEO_RANGE_
FULL;
+ return V
ideoRange::
FULL;
}
std::string name () const {
}
std::string name () const {
@@
-92,7
+94,12
@@
public:
* @return Number of assets of this type in this DCP.
*/
int text_count (TextType type) const {
* @return Number of assets of this type in this DCP.
*/
int text_count (TextType type) const {
- return _text_count[type];
+ return _text_count[static_cast<int>(type)];
+ }
+
+ DCPTextTrack dcp_text_track (int i) const {
+ DCPOMATIC_ASSERT (i >= 0 && i < static_cast<int>(_dcp_text_tracks.size()));
+ return _dcp_text_tracks[i];
}
bool kdm_valid () const {
}
bool kdm_valid () const {
@@
-127,38
+134,50
@@
public:
return _ratings;
}
return _ratings;
}
- std::
string content_version
() const {
- return _content_version;
+ std::
vector<std::string> content_versions
() const {
+ return _content_version
s
;
}
bool has_atmos () const {
return _has_atmos;
}
}
bool has_atmos () const {
return _has_atmos;
}
+ Frame atmos_length () const {
+ return _atmos_length;
+ }
+
+ dcp::Fraction atmos_edit_rate () const {
+ return _atmos_edit_rate;
+ }
+
private:
boost::optional<double> _video_frame_rate;
boost::optional<dcp::Size> _video_size;
private:
boost::optional<double> _video_frame_rate;
boost::optional<dcp::Size> _video_size;
- Frame _video_length;
+ Frame _video_length
= 0
;
boost::optional<int> _audio_channels;
boost::optional<int> _audio_frame_rate;
boost::optional<int> _audio_channels;
boost::optional<int> _audio_frame_rate;
- Frame _audio_length;
+ Frame _audio_length
= 0
;
std::string _name;
/** true if this DCP has video content (but false if it has unresolved references to video content) */
std::string _name;
/** true if this DCP has video content (but false if it has unresolved references to video content) */
- bool _has_video;
+ bool _has_video
= false
;
/** true if this DCP has audio content (but false if it has unresolved references to audio content) */
/** true if this DCP has audio content (but false if it has unresolved references to audio content) */
- bool _has_audio;
+ bool _has_audio
= false
;
/** number of different assets of each type (OCAP/CCAP) */
/** number of different assets of each type (OCAP/CCAP) */
- int _text_count[TEXT_COUNT];
- bool _encrypted;
- bool _needs_assets;
- bool _kdm_valid;
+ int _text_count[static_cast<int>(TextType::COUNT)];
+ /** the DCPTextTracks for each of our CCAPs */
+ std::vector<DCPTextTrack> _dcp_text_tracks;
+ bool _encrypted = false;
+ bool _needs_assets = false;
+ bool _kdm_valid = false;
boost::optional<dcp::Standard> _standard;
boost::optional<dcp::Standard> _standard;
- bool _three_d;
+ bool _three_d
= false
;
dcp::ContentKind _content_kind;
std::string _cpl;
std::list<int64_t> _reel_lengths;
std::map<dcp::Marker, dcp::Time> _markers;
std::vector<dcp::Rating> _ratings;
dcp::ContentKind _content_kind;
std::string _cpl;
std::list<int64_t> _reel_lengths;
std::map<dcp::Marker, dcp::Time> _markers;
std::vector<dcp::Rating> _ratings;
- std::string _content_version;
- bool _has_atmos;
+ std::vector<std::string> _content_versions;
+ bool _has_atmos = false;
+ Frame _atmos_length = 0;
+ dcp::Fraction _atmos_edit_rate;
};
};