Use edit rate not frame rate for displaying rate of DCPs.

diff --git a/ChangeLog b/ChangeLog
index e564e7a8f82ab6dec1aebdda520d1f414db51587..99ec8dadffc0919a40ce797c33e88eb493368fa8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-06-14  c.hetherington  <cth@carlh.net>
 
+       * Fix incorrectly-reported frame rate when importing
+       3D DCPs.
+
        * Select correct video frame type when importing DCPs (part of #806).
 
 2016-06-13  Carl Hetherington  <cth@carlh.net>

diff --git a/src/lib/dcp_examiner.cc b/src/lib/dcp_examiner.cc
index e3b0fb6eec2c6b09c1a64f1da76d765819a90963..06bef4c3aa29ac2ed1680e2cd2fc041541883c02 100644 (file)
--- a/src/lib/dcp_examiner.cc
+++ b/src/lib/dcp_examiner.cc
@@ -73,7 +73,7 @@ DCPExaminer::DCPExaminer (shared_ptr<const DCPContent> content)
        for (list<shared_ptr<dcp::Reel> >::const_iterator i = reels.begin(); i != reels.end(); ++i) {
 
                if ((*i)->main_picture ()) {
-                       dcp::Fraction const frac = (*i)->main_picture()->frame_rate ();
+                       dcp::Fraction const frac = (*i)->main_picture()->edit_rate ();
                        float const fr = float(frac.numerator) / frac.denominator;
                        if (!_video_frame_rate) {
                                _video_frame_rate = fr;