From 916247147468aee47354ebb3088f47b8a56fcccf Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 12 Aug 2012 20:52:15 +0100 Subject: Don't crash with no audio; get video MXF information from the MXF itself; get sampling rate from audio MXF. --- src/dcp.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/dcp.cc') diff --git a/src/dcp.cc b/src/dcp.cc index fa94c44d..f0269bda 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -346,18 +346,17 @@ DCP::DCP (string directory) _directory, n, _fps, - _length, - cpl_assets->main_picture->screen_aspect_ratio.numerator, - cpl_assets->main_picture->screen_aspect_ratio.denominator + _length ) )); - n = cpl_assets->main_sound->annotation_text; - if (n.empty ()) { - n = pkl->asset_from_id(cpl_assets->main_sound->id)->original_file_name; - } - if (cpl_assets->main_sound) { + + n = cpl_assets->main_sound->annotation_text; + if (n.empty ()) { + n = pkl->asset_from_id(cpl_assets->main_sound->id)->original_file_name; + } + _assets.push_back (shared_ptr ( new SoundAsset ( _directory, -- cgit v1.2.3