Rename certificate -> recipient in Screen.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 4a26ded3d748968c9ebd4029043a31c37077678e..d406152a19a494a865401979baa0e9e13eed749a 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1143,8 +1143,8 @@ Film::make_kdms (
        list<ScreenKDM> kdms;
 
        BOOST_FOREACH (shared_ptr<Screen> i, screens) {
-               if (i->certificate) {
-                       kdms.push_back (ScreenKDM (i, make_kdm (i->certificate.get(), dcp, from, until, formulation)));
+               if (i->recipient) {
+                       kdms.push_back (ScreenKDM (i, make_kdm (i->recipient.get(), dcp, from, until, formulation)));
                }
        }
 
@@ -1253,6 +1253,8 @@ Film::audio_output_names () const
                return audio_processor()->input_names ();
        }
 
+       DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 16);
+
        vector<string> n;
        n.push_back (_("L"));
        n.push_back (_("R"));
@@ -1266,6 +1268,10 @@ Film::audio_output_names () const
        n.push_back (_("Rc"));
        n.push_back (_("BsL"));
        n.push_back (_("BsR"));
+       n.push_back (_("DBP"));
+       n.push_back (_("DBS"));
+       n.push_back (_("NC"));
+       n.push_back (_("NC"));
 
        return vector<string> (n.begin(), n.begin() + audio_channels ());
 }
@@ -1292,7 +1298,7 @@ list<DCPTimePeriod>
 Film::reels () const
 {
        list<DCPTimePeriod> p;
-       DCPTime const len = length ();
+       DCPTime const len = length().round_up (video_frame_rate ());
 
        switch (reel_type ()) {
        case REELTYPE_SINGLE: