No-op; fix GPL address and use the explicit-program-name version.

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

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index 22b10ab84182f1890eb80804c29a2f97d98be6a0..92f0d15c87c7847a085e0a13bc71e53cb9fd0664 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -51,7 +52,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        , _kdm_valid (false)
 {
        dcp::DCP dcp (content->directory ());
-       dcp.read ();
+       dcp.read (false, 0, true);
 
        if (content->kdm ()) {
                dcp.add (dcp::DecryptedKDM (content->kdm().get(), Config::instance()->decryption_chain()->key().get ()));
@@ -99,7 +100,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        if (!_audio_frame_rate) {
                                _audio_frame_rate = asset->sampling_rate ();
                        } else if (_audio_frame_rate.get() != asset->sampling_rate ()) {
-                               throw DCPError (_("Mismatched audio frame rates in DCP"));
+                               throw DCPError (_("Mismatched audio sample rates in DCP"));
                        }
 
                        _audio_length += (*i)->main_sound()->duration();
@@ -134,4 +135,6 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
                        throw runtime_error (_("The KDM does not decrypt the DCP.  Perhaps it is targeted at the wrong CPL."));
                }
        }
+
+       _standard = dcp.standard ();
 }