projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.h
diff --git
a/src/lib/dcp_examiner.h
b/src/lib/dcp_examiner.h
index 0d55d4643e69f80060e7305f34208b47089300ba..4b93bfa4298e99606f9d61f4e14923221065f268 100644
(file)
--- a/
src/lib/dcp_examiner.h
+++ b/
src/lib/dcp_examiner.h
@@
-59,10
+59,6
@@
public:
return _name;
}
return _name;
}
- int captions () const {
- return _captions;
- }
-
bool encrypted () const {
return _encrypted;
}
bool encrypted () const {
return _encrypted;
}
@@
-87,6
+83,10
@@
public:
return _audio_frame_rate.get_value_or (48000);
}
return _audio_frame_rate.get_value_or (48000);
}
+ bool has_text (TextType type) const {
+ return _has_text[type];
+ }
+
bool kdm_valid () const {
return _kdm_valid;
}
bool kdm_valid () const {
return _kdm_valid;
}
@@
-119,7
+119,7
@@
private:
bool _has_video;
/** true if this DCP has audio content (but false if it has unresolved references to audio content) */
bool _has_audio;
bool _has_video;
/** true if this DCP has audio content (but false if it has unresolved references to audio content) */
bool _has_audio;
-
int _captions
;
+
bool _has_text[TEXT_COUNT]
;
bool _encrypted;
bool _needs_assets;
bool _kdm_valid;
bool _encrypted;
bool _needs_assets;
bool _kdm_valid;