Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index b2034890b04eab8e58cc52824fd359143bce09e6..80887a609eb01f9c593e5e1bfb4f4c7841a3cfe6 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -35,6 +35,9 @@
 #include <dcp/stereo_picture_asset.h>
 #include <dcp/stereo_picture_asset_reader.h>
 #include <dcp/stereo_picture_frame.h>
+#include <dcp/sound_asset.h>
+#include <dcp/sound_asset_reader.h>
+#include <dcp/subtitle_asset.h>
 #include <dcp/reel_subtitle_asset.h>
 #include <dcp/sound_asset.h>
 #include <boost/foreach.hpp>
@@ -160,17 +163,25 @@ 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 ();
        _kdm_valid = true;
 
-       /* Check that we can read the first picture frame */
+       /* Check that we can read the first picture, sound and subtitle frames of each reel */
        try {
-               if (!cpl->reels().empty ()) {
-                       shared_ptr<dcp::PictureAsset> asset = cpl->reels().front()->main_picture()->asset ();
-                       shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
-                       shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
+               BOOST_FOREACH (shared_ptr<dcp::Reel> i, cpl->reels()) {
+                       shared_ptr<dcp::PictureAsset> pic = i->main_picture()->asset ();
+                       shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (pic);
+                       shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (pic);
 
                        if (mono) {
                                mono->start_read()->get_frame(0)->xyz_image ();
@@ -178,13 +189,19 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                                stereo->start_read()->get_frame(0)->xyz_image (dcp::EYE_LEFT);
                        }
 
+                       if (i->main_sound()) {
+                               shared_ptr<dcp::SoundAsset> sound = i->main_sound()->asset ();
+                               i->main_sound()->asset()->start_read()->get_frame(0);
+                       }
+
+                       if (i->main_subtitle()) {
+                               i->main_subtitle()->asset()->subtitles ();
+                       }
                }
        } 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 ());