Partial conversion of PlayerSubtitles -> PlayerText and SubtitleString -> PlainText.

[dcpomatic.git] / src / lib / dcp_examiner.cc

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index e25583cb69064b9ac3dd2fdb7352ab17c13efece..c097877a33816f02760491796598a1088793f1e1 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -55,6 +55,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        : DCP (content)
        , _video_length (0)
        , _audio_length (0)
+       , _has_video (false)
+       , _has_audio (false)
        , _has_subtitles (false)
        , _encrypted (false)
        , _needs_assets (false)
@@ -120,6 +122,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                throw DCPError (_("Mismatched frame rates in DCP"));
                        }
 
+                       _has_video = true;
                        shared_ptr<dcp::PictureAsset> asset = i->main_picture()->asset ();
                        if (!_video_size) {
                                _video_size = asset->size ();
@@ -137,6 +140,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                return;
                        }
 
+                       _has_audio = true;
                        shared_ptr<dcp::SoundAsset> asset = i->main_sound()->asset ();
 
                        if (!_audio_channels) {
@@ -163,6 +167,14 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
 
                        _has_subtitles = true;
                }
+
+               if (i->main_picture()) {
+                       _reel_lengths.push_back (i->main_picture()->duration());
+               } else if (i->main_sound()) {
+                       _reel_lengths.push_back (i->main_sound()->duration());
+               } else if (i->main_subtitle()) {
+                       _reel_lengths.push_back (i->main_subtitle()->duration());
+               }
        }
 
        _encrypted = cpl->encrypted ();
@@ -192,10 +204,8 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                }
        } catch (dcp::DCPReadError& e) {
                _kdm_valid = false;
-               if (_encrypted && content->kdm ()) {
-                       /* XXX: maybe don't use an exception for this */
-                       throw runtime_error (_("The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."));
-               }
+       } catch (dcp::MiscError& e) {
+               _kdm_valid = false;
        }
 
        DCPOMATIC_ASSERT (cpl->standard ());