From d0da1d77b1fc2f65eeab8572e5ee76bf85094dda Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 27 Sep 2022 00:35:42 +0200 Subject: Use EnumIndexedVector in DCPExaminer. --- src/lib/dcp_examiner.cc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/lib/dcp_examiner.cc') diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc index 0cfe499a3..af9e38873 100644 --- a/src/lib/dcp_examiner.cc +++ b/src/lib/dcp_examiner.cc @@ -65,10 +65,6 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) { shared_ptr cpl; - for (int i = 0; i < static_cast(TextType::COUNT); ++i) { - _text_count[i] = 0; - } - auto cpls = dcp::find_and_resolve_cpls (content->directories(), tolerant); if (content->cpl ()) { @@ -204,7 +200,7 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) LOG_GENERAL ("Main subtitle %1 of reel %2 found", i->main_subtitle()->id(), i->id()); - _text_count[static_cast(TextType::OPEN_SUBTITLE)] = 1; + _text_count[TextType::OPEN_SUBTITLE] = 1; _open_subtitle_language = try_to_parse_language (i->main_subtitle()->language()); for (auto const& font: i->main_subtitle()->asset()->font_data()) { @@ -222,7 +218,7 @@ DCPExaminer::DCPExaminer (shared_ptr content, bool tolerant) LOG_GENERAL ("Closed caption %1 of reel %2 found", j->id(), i->id()); - _text_count[static_cast(TextType::CLOSED_CAPTION)]++; + _text_count[TextType::CLOSED_CAPTION]++; _dcp_text_tracks.push_back (DCPTextTrack(j->annotation_text().get_value_or(""), try_to_parse_language(j->language()))); } -- cgit v1.2.3