projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: remove unnecessary explicit.
[dcpomatic.git]
/
src
/
lib
/
dcp_examiner.h
diff --git
a/src/lib/dcp_examiner.h
b/src/lib/dcp_examiner.h
index 6b88a3c0d412d13d2cf636b7ac49854a28dca682..b51e7ae7a8e53d69cf406a05f2956599e5a22f89 100644
(file)
--- a/
src/lib/dcp_examiner.h
+++ b/
src/lib/dcp_examiner.h
@@
-38,7
+38,7
@@
class DCPContent;
class DCPExaminer : public VideoExaminer, public AudioExaminer
{
public:
class DCPExaminer : public VideoExaminer, public AudioExaminer
{
public:
-
explicit DCPExaminer
(std::shared_ptr<const DCPContent>, bool tolerant);
+
DCPExaminer
(std::shared_ptr<const DCPContent>, bool tolerant);
bool has_video () const override {
return _has_video;
bool has_video () const override {
return _has_video;
@@
-103,10
+103,12
@@
public:
}
/** @param type TEXT_OPEN_SUBTITLE or TEXT_CLOSED_CAPTION.
}
/** @param type TEXT_OPEN_SUBTITLE or TEXT_CLOSED_CAPTION.
- * @return Number of assets of this type in this DCP.
+ * @return the number of "streams" of this type in the DCP.
+ * Reels do not affect the return value of this method: if a DCP
+ * has any subtitles, type=TEXT_OPEN_SUBTITLE will return 1.
*/
int text_count (TextType type) const {
*/
int text_count (TextType type) const {
- return _text_count[
static_cast<int>(type)
];
+ return _text_count[
type
];
}
boost::optional<dcp::LanguageTag> open_subtitle_language () const {
}
boost::optional<dcp::LanguageTag> open_subtitle_language () const {
@@
-186,7
+188,7
@@
private:
bool _has_audio = false;
boost::optional<dcp::LanguageTag> _audio_language;
/** number of different assets of each type (OCAP/CCAP) */
bool _has_audio = false;
boost::optional<dcp::LanguageTag> _audio_language;
/** number of different assets of each type (OCAP/CCAP) */
-
int _text_count[static_cast<int>(TextType::COUNT)]
;
+
EnumIndexedVector<int, TextType> _text_count
;
boost::optional<dcp::LanguageTag> _open_subtitle_language;
/** the DCPTextTracks for each of our CCAPs */
std::vector<DCPTextTrack> _dcp_text_tracks;
boost::optional<dcp::LanguageTag> _open_subtitle_language;
/** the DCPTextTracks for each of our CCAPs */
std::vector<DCPTextTrack> _dcp_text_tracks;